lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes on nginx and CS

Browse Source
This commit is contained in:
Joseph Cohen
2015-02-19 02:39:32 -06:00
parent b56cc91e17
commit c44f8228f5
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -10,7 +10,7 @@ ENV DB_DRIVER=mysql \
COPY . /var/www/html/
WORKDIR /var/www/html/
#using nodesource and debian jessie packages instead of compiling from scratch
# Using nodesource and debian jessie packages instead of compiling from scratch
RUN DEBIAN_FRONTEND=noninteractive \
echo "APT::Install-Recommends \"0\";" >> /etc/apt/apt.conf.d/02recommends && \
echo "APT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/02recommends && \
@@ -28,11 +28,11 @@ RUN DEBIAN_FRONTEND=noninteractive \
rm -r /var/lib/apt/lists/* && \
chown -R www-data /var/www/html
# ensure the assets have been compiled
# Ensure the assets have been compiled
RUN for d in public/{build,css,js} ; do test ! -d public/build && \
echo "Run 'gulp' before building container" >&2 && exit 1 || : ; done
# hardcode the Illuminate key in app/config/app.php. If you want security, feel free
# Hardcode the Illuminate key in app/config/app.php. If you want security, feel free
# to override the key in your own container with a 'php artisan key:generate' :)
RUN sed -i "s/'key' => '\w.*/'key' => 'f20d3e5ae02125a94bd60203a4edfbde',/" app/config/app.php && \
grep key app/config/app.php

42
nginx-site.conf
View File

@@ -1,28 +1,30 @@
server {
listen 8000 default; ## listen for ipv4; this line is default and implied
listen 8000 default; ## Listen for ipv4; this line is default and implied
# Make site accessible from http://localhost/
server_name localhost;
root /var/www/html/public;
index index.html index.htm index.php;
root /var/www/html/public;
index index.php;
charset utf-8;
# Make site accessible from http://localhost/
server_name localhost;
location / {
try_files $uri $uri/ /index.php?$query_string;
}
location / {
try_files $uri /index.php$is_args$args;
}
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
#
location ~ \.php$ {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_index index.php;
fastcgi_keep_conn on;
}
# Pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_index index.php;
fastcgi_keep_conn on;
}
location ~ /\.ht {
deny all;
}
}

2
php-fpm-pool.conf
View File

@@ -1,5 +1,4 @@
[www]
user = www-data
group = www-data
@@ -22,5 +21,4 @@ env[DB_PASSWORD] = $DB_PASSWORD
[global]
daemonize = no