瀏覽代碼

Merge pull request #2359 from nginx-proxy/cleanup-dockerfiles

refactor: cleanup dockerfiles
Nicolas Duchon 1 年之前
父節點
當前提交
4fbd14f1fd
共有 3 個文件被更改,包括 4 次插入18 次删除
  1. 2 8
      Dockerfile.alpine
  2. 1 9
      Dockerfile.debian
  3. 1 1
      app/Procfile

+ 2 - 8
Dockerfile.alpine

@@ -14,16 +14,10 @@ ENV NGINX_PROXY_VERSION=${NGINX_PROXY_VERSION} \
    DOCKER_HOST=unix:///tmp/docker.sock
 
 # Install dependencies
-RUN apk add --no-cache --virtual .run-deps \
-   bash \
-   ca-certificates \
-   openssl \
-   && update-ca-certificates
+RUN apk add --no-cache --virtual .run-deps bash
 
 # Configure Nginx
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
-   && 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 \
+RUN sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
    && mkdir -p '/etc/nginx/dhparam'
 
 # Install Forego + docker-gen

+ 1 - 9
Dockerfile.debian

@@ -13,16 +13,8 @@ ENV NGINX_PROXY_VERSION=${NGINX_PROXY_VERSION} \
    DOCKER_GEN_VERSION=${DOCKER_GEN_VERSION} \
    DOCKER_HOST=unix:///tmp/docker.sock
 
-# Install/update certificates
-RUN apt-get update \
-   && apt-get install -y -q --no-install-recommends ca-certificates \
-   && apt-get clean \
-   && 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 \
-   && sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
+RUN sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
    && mkdir -p '/etc/nginx/dhparam'
 
 # Install Forego + docker-gen

+ 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;"