Skip to content

Commit dd0c8ab

Browse files
dbpolitodbpolito
committed
Fix nginx
1 parent c715a1c commit dd0c8ab

22 files changed

Lines changed: 22 additions & 11 deletions

File tree

‎7.1-nginx-prod/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
1818
&& ln -sf /dev/stdout /var/log/nginx/access.log \
1919
&& ln -sf /dev/stderr /var/log/nginx/error.log \
2020
# add h5bp/server-configs-nginx
21+
&& mkdir -p /etc/nginx/conf.d \
2122
&& mkdir /etc/nginx/h5bp \
2223
&& cd /etc/nginx/h5bp \
2324
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \

‎7.1-nginx-prod/entrypoint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
99
usermod -u $CURRENT_USER kool
1010
fi
1111

12-
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
12+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
1313

1414
# Run entrypoint if provided
1515
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then

‎7.1-nginx/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
1818
&& ln -sf /dev/stdout /var/log/nginx/access.log \
1919
&& ln -sf /dev/stderr /var/log/nginx/error.log \
2020
# add h5bp/server-configs-nginx
21+
&& mkdir -p /etc/nginx/conf.d \
2122
&& mkdir /etc/nginx/h5bp \
2223
&& cd /etc/nginx/h5bp \
2324
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \

‎7.1-nginx/entrypoint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
1818
usermod -u $CURRENT_USER kool
1919
fi
2020

21-
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
21+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
2222

2323
# Run entrypoint if provided
2424
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then

‎7.2-nginx-prod/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
1818
&& ln -sf /dev/stdout /var/log/nginx/access.log \
1919
&& ln -sf /dev/stderr /var/log/nginx/error.log \
2020
# add h5bp/server-configs-nginx
21+
&& mkdir -p /etc/nginx/conf.d \
2122
&& mkdir /etc/nginx/h5bp \
2223
&& cd /etc/nginx/h5bp \
2324
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \

‎7.2-nginx-prod/entrypoint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
99
usermod -u $CURRENT_USER kool
1010
fi
1111

12-
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
12+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
1313

1414
# Run entrypoint if provided
1515
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then

‎7.2-nginx/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
1818
&& ln -sf /dev/stdout /var/log/nginx/access.log \
1919
&& ln -sf /dev/stderr /var/log/nginx/error.log \
2020
# add h5bp/server-configs-nginx
21+
&& mkdir -p /etc/nginx/conf.d \
2122
&& mkdir /etc/nginx/h5bp \
2223
&& cd /etc/nginx/h5bp \
2324
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \

‎7.2-nginx/entrypoint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
1818
usermod -u $CURRENT_USER kool
1919
fi
2020

21-
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
21+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
2222

2323
# Run entrypoint if provided
2424
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then

‎7.3-nginx-prod/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
1818
&& ln -sf /dev/stdout /var/log/nginx/access.log \
1919
&& ln -sf /dev/stderr /var/log/nginx/error.log \
2020
# add h5bp/server-configs-nginx
21+
&& mkdir -p /etc/nginx/conf.d \
2122
&& mkdir /etc/nginx/h5bp \
2223
&& cd /etc/nginx/h5bp \
2324
&& wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \

‎7.3-nginx-prod/entrypoint‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
99
usermod -u $CURRENT_USER kool
1010
fi
1111

12-
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/http.d/default.conf
12+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
1313

1414
# Run entrypoint if provided
1515
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then

0 commit comments

Comments
 (0)