Skip to content

Commit b3aabde

Browse files
dbpolitodbpolito
authored
Merge pull request #9 from fbrissi/master
More Environments
2 parents d8ad4af + db80e19 commit b3aabde

19 files changed

Lines changed: 97 additions & 27 deletions

File tree

‎.gitignore‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# IntelliJ project files
2+
*.iml
3+
*.iws
4+
*.ipr
5+
.idea/
6+
7+
# eclipse project file
8+
.settings/
9+
.classpath
10+
.project
11+
12+
# NetBeans specific
13+
nbproject/private/
14+
build/
15+
nbbuild/
16+
dist/
17+
nbdist/
18+
nbactions.xml
19+
nb-configuration.xml
20+
21+
# OS
22+
.DS_Store
23+
24+
# Misc
25+
*.swp

‎7.1-nginx-prod/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ FROM kooldev/php:7.1-prod
33
ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
44
NGINX_LISTEN=80 \
55
NGINX_ROOT=/app/public \
6+
NGINX_INDEX=index.php \
67
NGINX_CLIENT_MAX_BODY_SIZE=25M \
78
NGINX_PHP_FPM=unix:/run/php-fpm.sock \
8-
NGINX_FASTCGI_READ_TIMEOUT=60s
9+
NGINX_FASTCGI_READ_TIMEOUT=60s \
10+
NGINX_FASTCGI_BUFFERS='8 8k' \
11+
NGINX_FASTCGI_BUFFER_SIZE='16k'
912

1013
RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
1114
&& chmod +x /usr/local/bin/supervisord \

‎7.1-nginx-prod/default.tmpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ server {
22
listen {{ .Env.NGINX_LISTEN }} default_server;
33
server_name _;
44
root {{ .Env.NGINX_ROOT }};
5-
index index.php;
5+
index {{ .Env.NGINX_INDEX }};
66
charset utf-8;
77

88
location = /favicon.ico { log_not_found off; access_log off; }
@@ -13,12 +13,14 @@ server {
1313
error_page 404 /index.php;
1414

1515
location / {
16-
try_files $uri $uri/ /index.php?$query_string;
16+
try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
1717

1818
add_header X-Served-By kool.dev;
1919
}
2020

2121
location ~ \.php$ {
22+
fastcgi_buffers {{ .Env.NGINX_FASTCGI_BUFFERS }};
23+
fastcgi_buffer_size {{ .Env.NGINX_FASTCGI_BUFFER_SIZE }};
2224
fastcgi_pass {{ .Env.NGINX_PHP_FPM }};
2325
fastcgi_read_timeout {{ .Env.NGINX_FASTCGI_READ_TIMEOUT }};
2426
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;

‎7.1-nginx/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ FROM kooldev/php:7.1
33
ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
44
NGINX_LISTEN=80 \
55
NGINX_ROOT=/app/public \
6+
NGINX_INDEX=index.php \
67
NGINX_CLIENT_MAX_BODY_SIZE=25M \
78
NGINX_PHP_FPM=unix:/run/php-fpm.sock \
8-
NGINX_FASTCGI_READ_TIMEOUT=60s
9+
NGINX_FASTCGI_READ_TIMEOUT=60s \
10+
NGINX_FASTCGI_BUFFERS='8 8k' \
11+
NGINX_FASTCGI_BUFFER_SIZE='16k'
912

1013
RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
1114
&& chmod +x /usr/local/bin/supervisord \

‎7.1-nginx/default.tmpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ server {
22
listen {{ .Env.NGINX_LISTEN }} default_server;
33
server_name _;
44
root {{ .Env.NGINX_ROOT }};
5-
index index.php;
5+
index {{ .Env.NGINX_INDEX }};
66
charset utf-8;
77

88
location = /favicon.ico { log_not_found off; access_log off; }
@@ -13,12 +13,14 @@ server {
1313
error_page 404 /index.php;
1414

1515
location / {
16-
try_files $uri $uri/ /index.php?$query_string;
16+
try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
1717

1818
add_header X-Served-By kool.dev;
1919
}
2020

2121
location ~ \.php$ {
22+
fastcgi_buffers {{ .Env.NGINX_FASTCGI_BUFFERS }};
23+
fastcgi_buffer_size {{ .Env.NGINX_FASTCGI_BUFFER_SIZE }};
2224
fastcgi_pass {{ .Env.NGINX_PHP_FPM }};
2325
fastcgi_read_timeout {{ .Env.NGINX_FASTCGI_READ_TIMEOUT }};
2426
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;

‎7.2-nginx-prod/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ FROM kooldev/php:7.2-prod
33
ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
44
NGINX_LISTEN=80 \
55
NGINX_ROOT=/app/public \
6+
NGINX_INDEX=index.php \
67
NGINX_CLIENT_MAX_BODY_SIZE=25M \
78
NGINX_PHP_FPM=unix:/run/php-fpm.sock \
8-
NGINX_FASTCGI_READ_TIMEOUT=60s
9+
NGINX_FASTCGI_READ_TIMEOUT=60s \
10+
NGINX_FASTCGI_BUFFERS='8 8k' \
11+
NGINX_FASTCGI_BUFFER_SIZE='16k'
912

1013
RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
1114
&& chmod +x /usr/local/bin/supervisord \

‎7.2-nginx-prod/default.tmpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ server {
22
listen {{ .Env.NGINX_LISTEN }} default_server;
33
server_name _;
44
root {{ .Env.NGINX_ROOT }};
5-
index index.php;
5+
index {{ .Env.NGINX_INDEX }};
66
charset utf-8;
77

88
location = /favicon.ico { log_not_found off; access_log off; }
@@ -13,12 +13,14 @@ server {
1313
error_page 404 /index.php;
1414

1515
location / {
16-
try_files $uri $uri/ /index.php?$query_string;
16+
try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
1717

1818
add_header X-Served-By kool.dev;
1919
}
2020

2121
location ~ \.php$ {
22+
fastcgi_buffers {{ .Env.NGINX_FASTCGI_BUFFERS }};
23+
fastcgi_buffer_size {{ .Env.NGINX_FASTCGI_BUFFER_SIZE }};
2224
fastcgi_pass {{ .Env.NGINX_PHP_FPM }};
2325
fastcgi_read_timeout {{ .Env.NGINX_FASTCGI_READ_TIMEOUT }};
2426
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;

‎7.2-nginx/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ FROM kooldev/php:7.2
33
ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
44
NGINX_LISTEN=80 \
55
NGINX_ROOT=/app/public \
6+
NGINX_INDEX=index.php \
67
NGINX_CLIENT_MAX_BODY_SIZE=25M \
78
NGINX_PHP_FPM=unix:/run/php-fpm.sock \
8-
NGINX_FASTCGI_READ_TIMEOUT=60s
9+
NGINX_FASTCGI_READ_TIMEOUT=60s \
10+
NGINX_FASTCGI_BUFFERS='8 8k' \
11+
NGINX_FASTCGI_BUFFER_SIZE='16k'
912

1013
RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
1114
&& chmod +x /usr/local/bin/supervisord \

‎7.2-nginx/default.tmpl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ server {
22
listen {{ .Env.NGINX_LISTEN }} default_server;
33
server_name _;
44
root {{ .Env.NGINX_ROOT }};
5-
index index.php;
5+
index {{ .Env.NGINX_INDEX }};
66
charset utf-8;
77

88
location = /favicon.ico { log_not_found off; access_log off; }
@@ -13,12 +13,14 @@ server {
1313
error_page 404 /index.php;
1414

1515
location / {
16-
try_files $uri $uri/ /index.php?$query_string;
16+
try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
1717

1818
add_header X-Served-By kool.dev;
1919
}
2020

2121
location ~ \.php$ {
22+
fastcgi_buffers {{ .Env.NGINX_FASTCGI_BUFFERS }};
23+
fastcgi_buffer_size {{ .Env.NGINX_FASTCGI_BUFFER_SIZE }};
2224
fastcgi_pass {{ .Env.NGINX_PHP_FPM }};
2325
fastcgi_read_timeout {{ .Env.NGINX_FASTCGI_READ_TIMEOUT }};
2426
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;

‎7.3-nginx-prod/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ FROM kooldev/php:7.3-prod
33
ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
44
NGINX_LISTEN=80 \
55
NGINX_ROOT=/app/public \
6+
NGINX_INDEX=index.php \
67
NGINX_CLIENT_MAX_BODY_SIZE=25M \
78
NGINX_PHP_FPM=unix:/run/php-fpm.sock \
8-
NGINX_FASTCGI_READ_TIMEOUT=60s
9+
NGINX_FASTCGI_READ_TIMEOUT=60s \
10+
NGINX_FASTCGI_BUFFERS='8 8k' \
11+
NGINX_FASTCGI_BUFFER_SIZE='16k'
912

1013
RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
1114
&& chmod +x /usr/local/bin/supervisord \

0 commit comments

Comments
 (0)