Skip to content

Commit 2f56534

Browse files
fabriciojsfabriciojs
committed
generating all files from template
1 parent e95f63a commit 2f56534

30 files changed

Lines changed: 240 additions & 30 deletions

‎7.1-nginx-prod/Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
1313
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 \
1414
&& chmod +x /usr/local/bin/supervisord \
1515
&& apk add --no-cache nginx \
16-
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
1716
&& chown -R kool:kool /var/tmp/nginx \
1817
&& chmod 770 /var/tmp/nginx \
1918
&& ln -sf /dev/stdout /var/log/nginx/access.log \
20-
&& ln -sf /dev/stderr /var/log/nginx/error.log
19+
&& ln -sf /dev/stderr /var/log/nginx/error.log \
20+
# add h5bp/server-configs-nginx
21+
&& mkdir /etc/nginx/h5bp \
22+
&& cd /etc/nginx/h5bp \
23+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
24+
&& tar xzvf h5bp.tgz \
25+
&& rm -f h5bp.tgz \
26+
&& mv server-configs-nginx-*/h5bp/* . \
27+
&& mv server-configs-nginx-*/nginx.conf /etc/nginx/nginx.conf \
28+
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
29+
&& mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \
30+
&& rm -rf server-configs-nginx-*
2131

2232
COPY supervisor.conf /kool/supervisor.conf
2333
COPY default.tmpl /kool/default.tmpl

‎7.1-nginx-prod/default.tmpl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,15 @@ server {
3030
location ~ /\.ht {
3131
deny all;
3232
}
33+
34+
# basic H5BP suggestions
35+
include h5bp/internet_explorer/x-ua-compatible.conf;
36+
include h5bp/security/referrer-policy.conf;
37+
include h5bp/security/x-content-type-options.conf;
38+
include h5bp/security/x-frame-options.conf;
39+
include h5bp/security/x-xss-protection.conf;
40+
41+
# performance enhancements (mostly for caching static data)
42+
include h5bp/web_performance/cache-file-descriptors.conf;
43+
include h5bp/web_performance/pre-compressed_content_gzip.conf;
3344
}

‎7.1-nginx-prod/supervisor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[program:nginx]
22
depends_on = php-fpm
3-
command = nginx -g "pid /run/nginx.pid; daemon off;"
3+
command = nginx -g "daemon off;"
44
stopasgroup = true
55
stderr_logfile = /dev/stderr
66
stdout_logfile = /dev/stdout

‎7.1-nginx/Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
1313
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 \
1414
&& chmod +x /usr/local/bin/supervisord \
1515
&& apk add --no-cache nginx \
16-
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
1716
&& chown -R kool:kool /var/tmp/nginx \
1817
&& chmod 770 /var/tmp/nginx \
1918
&& ln -sf /dev/stdout /var/log/nginx/access.log \
20-
&& ln -sf /dev/stderr /var/log/nginx/error.log
19+
&& ln -sf /dev/stderr /var/log/nginx/error.log \
20+
# add h5bp/server-configs-nginx
21+
&& mkdir /etc/nginx/h5bp \
22+
&& cd /etc/nginx/h5bp \
23+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
24+
&& tar xzvf h5bp.tgz \
25+
&& rm -f h5bp.tgz \
26+
&& mv server-configs-nginx-*/h5bp/* . \
27+
&& mv server-configs-nginx-*/nginx.conf /etc/nginx/nginx.conf \
28+
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
29+
&& mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \
30+
&& rm -rf server-configs-nginx-*
2131

2232
COPY supervisor.conf /kool/supervisor.conf
2333
COPY default.tmpl /kool/default.tmpl

‎7.1-nginx/default.tmpl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,15 @@ server {
3030
location ~ /\.ht {
3131
deny all;
3232
}
33+
34+
# basic H5BP suggestions
35+
include h5bp/internet_explorer/x-ua-compatible.conf;
36+
include h5bp/security/referrer-policy.conf;
37+
include h5bp/security/x-content-type-options.conf;
38+
include h5bp/security/x-frame-options.conf;
39+
include h5bp/security/x-xss-protection.conf;
40+
41+
# performance enhancements (mostly for caching static data)
42+
include h5bp/web_performance/cache-file-descriptors.conf;
43+
include h5bp/web_performance/pre-compressed_content_gzip.conf;
3344
}

‎7.1-nginx/supervisor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[program:nginx]
22
depends_on = php-fpm
3-
command = nginx -g "pid /run/nginx.pid; daemon off;"
3+
command = nginx -g "daemon off;"
44
stopasgroup = true
55
stderr_logfile = /dev/stderr
66
stdout_logfile = /dev/stdout

‎7.2-nginx-prod/Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
1313
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 \
1414
&& chmod +x /usr/local/bin/supervisord \
1515
&& apk add --no-cache nginx \
16-
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
1716
&& chown -R kool:kool /var/lib/nginx \
1817
&& chmod 770 /var/lib/nginx/tmp \
1918
&& ln -sf /dev/stdout /var/log/nginx/access.log \
20-
&& ln -sf /dev/stderr /var/log/nginx/error.log
19+
&& ln -sf /dev/stderr /var/log/nginx/error.log \
20+
# add h5bp/server-configs-nginx
21+
&& mkdir /etc/nginx/h5bp \
22+
&& cd /etc/nginx/h5bp \
23+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
24+
&& tar xzvf h5bp.tgz \
25+
&& rm -f h5bp.tgz \
26+
&& mv server-configs-nginx-*/h5bp/* . \
27+
&& mv server-configs-nginx-*/nginx.conf /etc/nginx/nginx.conf \
28+
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
29+
&& mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \
30+
&& rm -rf server-configs-nginx-*
2131

2232
COPY supervisor.conf /kool/supervisor.conf
2333
COPY default.tmpl /kool/default.tmpl

‎7.2-nginx-prod/default.tmpl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,15 @@ server {
3030
location ~ /\.ht {
3131
deny all;
3232
}
33+
34+
# basic H5BP suggestions
35+
include h5bp/internet_explorer/x-ua-compatible.conf;
36+
include h5bp/security/referrer-policy.conf;
37+
include h5bp/security/x-content-type-options.conf;
38+
include h5bp/security/x-frame-options.conf;
39+
include h5bp/security/x-xss-protection.conf;
40+
41+
# performance enhancements (mostly for caching static data)
42+
include h5bp/web_performance/cache-file-descriptors.conf;
43+
include h5bp/web_performance/pre-compressed_content_gzip.conf;
3344
}

‎7.2-nginx-prod/supervisor.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[program:nginx]
22
depends_on = php-fpm
3-
command = nginx -g "pid /run/nginx.pid; daemon off;"
3+
command = nginx -g "daemon off;"
44
stopasgroup = true
55
stderr_logfile = /dev/stderr
66
stdout_logfile = /dev/stdout

‎7.2-nginx/Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
1313
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 \
1414
&& chmod +x /usr/local/bin/supervisord \
1515
&& apk add --no-cache nginx \
16-
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
1716
&& chown -R kool:kool /var/lib/nginx \
1817
&& chmod 770 /var/lib/nginx/tmp \
1918
&& ln -sf /dev/stdout /var/log/nginx/access.log \
20-
&& ln -sf /dev/stderr /var/log/nginx/error.log
19+
&& ln -sf /dev/stderr /var/log/nginx/error.log \
20+
# add h5bp/server-configs-nginx
21+
&& mkdir /etc/nginx/h5bp \
22+
&& cd /etc/nginx/h5bp \
23+
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \
24+
&& tar xzvf h5bp.tgz \
25+
&& rm -f h5bp.tgz \
26+
&& mv server-configs-nginx-*/h5bp/* . \
27+
&& mv server-configs-nginx-*/nginx.conf /etc/nginx/nginx.conf \
28+
&& sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \
29+
&& mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \
30+
&& rm -rf server-configs-nginx-*
2131

2232
COPY supervisor.conf /kool/supervisor.conf
2333
COPY default.tmpl /kool/default.tmpl

0 commit comments

Comments
 (0)