From 5aba125fb7b359c44b419a746c052a3806d08d09 Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@pini.fr>
Date: Mon, 1 Jun 2020 07:15:00 +0000
Subject: [PATCH] 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.
---
 Dockerfile                                       | 2 +-
 Dockerfile.alpine                                | 2 +-
 Procfile => app/Procfile                         | 0
 {dhparam => app/dhparam}/ffdhe2048.pem           | 0
 {dhparam => app/dhparam}/ffdhe3072.pem           | 0
 {dhparam => app/dhparam}/ffdhe4096.pem           | 0
 docker-entrypoint.sh => app/docker-entrypoint.sh | 0
 test/test_ssl/test_dhparam.yml                   | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename Procfile => app/Procfile (100%)
 rename {dhparam => app/dhparam}/ffdhe2048.pem (100%)
 rename {dhparam => app/dhparam}/ffdhe3072.pem (100%)
 rename {dhparam => app/dhparam}/ffdhe4096.pem (100%)
 rename docker-entrypoint.sh => app/docker-entrypoint.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index 851baa1..35a2dbb 100644
--- a/Dockerfile
+++ b/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"]
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 7779572..602c5f9 100644
--- 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"]
diff --git a/Procfile b/app/Procfile
similarity index 100%
rename from Procfile
rename to app/Procfile
diff --git a/dhparam/ffdhe2048.pem b/app/dhparam/ffdhe2048.pem
similarity index 100%
rename from dhparam/ffdhe2048.pem
rename to app/dhparam/ffdhe2048.pem
diff --git a/dhparam/ffdhe3072.pem b/app/dhparam/ffdhe3072.pem
similarity index 100%
rename from dhparam/ffdhe3072.pem
rename to app/dhparam/ffdhe3072.pem
diff --git a/dhparam/ffdhe4096.pem b/app/dhparam/ffdhe4096.pem
similarity index 100%
rename from dhparam/ffdhe4096.pem
rename to app/dhparam/ffdhe4096.pem
diff --git a/docker-entrypoint.sh b/app/docker-entrypoint.sh
similarity index 100%
rename from docker-entrypoint.sh
rename to app/docker-entrypoint.sh
diff --git a/test/test_ssl/test_dhparam.yml b/test/test_ssl/test_dhparam.yml
index fa4fe1e..505ac4c 100644
--- 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