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

Do not copy useless files into the image
2025-02-24 01:38:15 +00:00 · 2022-03-07 16:22:39 +01:00 · 2022-03-07 16:22:39 +01:00 · 6b48e11e5c
commit 6b48e11e5c
parent 3257177d80 fea6cc7537
9 changed files with 9 additions and 5 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,6 +1,10 @@
 .git
+.github
+test
 .dockerignore
-circle.yml
+.gitignore
+*.yml
+Dockerfile*
+LICENSE
 Makefile
 README.md
-test
--- a/2
+++ b/2
@ -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"]
--- a/Dockerfile.alpine
+++ b/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"]
--- a/app/Procfile
+++ b/app/Procfile
--- a/app/dhparam/ffdhe2048.pem
+++ b/app/dhparam/ffdhe2048.pem
--- a/app/dhparam/ffdhe3072.pem
+++ b/app/dhparam/ffdhe3072.pem
--- a/app/dhparam/ffdhe4096.pem
+++ b/app/dhparam/ffdhe4096.pem
--- a/app/docker-entrypoint.sh
+++ b/app/docker-entrypoint.sh
--- a/test/test_ssl/test_dhparam.yml
+++ b/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