2
0
Эх сурвалжийг харах

Merge pull request #1444 from pini-gh/app-folder

Do not copy useless files into the image
Nicolas Duchon 3 жил өмнө
parent
commit
6b48e11e5c

+ 6 - 2
.dockerignore

@@ -1,6 +1,10 @@
 .git
+.github
+test
 .dockerignore
-circle.yml
+.gitignore
+*.yml
+Dockerfile*
+LICENSE
 Makefile
 README.md
-test

+ 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 . /app/
+COPY app nginx.tmpl /app/
 WORKDIR /app/
 
 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 . /app/
+COPY app nginx.tmpl /app/
 WORKDIR /app/
 
 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:
     - *docker-sock
     - *nginx-certs
-    - ../../dhparam/ffdhe3072.pem:/etc/nginx/dhparam/dhparam.pem:ro
+    - ../../app/dhparam/ffdhe3072.pem:/etc/nginx/dhparam/dhparam.pem:ro
 
 with_skip:
   container_name: dh-skip