浏览代码

chore: do not copy useless files into the image

Move required files but 'nginx.tmpl' into a local 'app' folder and copy the
folder content into the image.

'nginx.tmpl' should be moved as well, but this is a breaking change for
configuration with a separate 'docker-gen' container.
Gilles Filippini 5 年之前
父节点
当前提交
5aba125fb7
共有 8 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      Dockerfile
  2. 1 1
      Dockerfile.alpine
  3. 0 0
      app/Procfile
  4. 0 0
      app/dhparam/ffdhe2048.pem
  5. 0 0
      app/dhparam/ffdhe3072.pem
  6. 0 0
      app/dhparam/ffdhe4096.pem
  7. 0 0
      app/docker-entrypoint.sh
  8. 1 1
      test/test_ssl/test_dhparam.yml

+ 1 - 1
Dockerfile

@@ -67,7 +67,7 @@ COPY --from=dockergen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
 
 
 COPY network_internal.conf /etc/nginx/
 COPY network_internal.conf /etc/nginx/
 
 
-COPY . /app/
+COPY app nginx.tmpl /app/
 WORKDIR /app/
 WORKDIR /app/
 
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
 ENTRYPOINT ["/app/docker-entrypoint.sh"]

+ 1 - 1
Dockerfile.alpine

@@ -64,7 +64,7 @@ COPY --from=dockergen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
 
 
 COPY network_internal.conf /etc/nginx/
 COPY network_internal.conf /etc/nginx/
 
 
-COPY . /app/
+COPY app nginx.tmpl /app/
 WORKDIR /app/
 WORKDIR /app/
 
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
 ENTRYPOINT ["/app/docker-entrypoint.sh"]

+ 0 - 0
Procfile → app/Procfile


+ 0 - 0
dhparam/ffdhe2048.pem → app/dhparam/ffdhe2048.pem


+ 0 - 0
dhparam/ffdhe3072.pem → app/dhparam/ffdhe3072.pem


+ 0 - 0
dhparam/ffdhe4096.pem → app/dhparam/ffdhe4096.pem


+ 0 - 0
docker-entrypoint.sh → app/docker-entrypoint.sh


+ 1 - 1
test/test_ssl/test_dhparam.yml

@@ -54,7 +54,7 @@ with_custom_file:
   volumes:
   volumes:
     - *docker-sock
     - *docker-sock
     - *nginx-certs
     - *nginx-certs
-    - ../../dhparam/ffdhe3072.pem:/etc/nginx/dhparam/dhparam.pem:ro
+    - ../../app/dhparam/ffdhe3072.pem:/etc/nginx/dhparam/dhparam.pem:ro
 
 
 with_skip:
 with_skip:
   container_name: dh-skip
   container_name: dh-skip