ソースを参照

refactor: move nginx daemon off to procfile

Nicolas Duchon 1 年間 前
コミット
de4cb3d2b0
3 ファイル変更3 行追加5 行削除
  1. 1 2
      Dockerfile.alpine
  2. 1 2
      Dockerfile.debian
  3. 1 1
      app/Procfile

+ 1 - 2
Dockerfile.alpine

@@ -21,8 +21,7 @@ RUN apk add --no-cache --virtual .run-deps \
    && update-ca-certificates
 
 # Configure Nginx
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
-   && sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
+RUN sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
    && sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
    && mkdir -p '/etc/nginx/dhparam'
 

+ 1 - 2
Dockerfile.debian

@@ -20,8 +20,7 @@ RUN apt-get update \
    && rm -r /var/lib/apt/lists/*
 
 # Configure Nginx
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
-   && sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
+RUN sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
    && sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
    && mkdir -p '/etc/nginx/dhparam'
 

+ 1 - 1
app/Procfile

@@ -1,2 +1,2 @@
 dockergen: docker-gen -watch -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/conf.d/default.conf
-nginx: nginx
+nginx: nginx -g "daemon off;"