From 2fece1be9166f8126cdbf376156f89be9c503927 Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Fri, 1 Dec 2023 14:14:13 +0100
Subject: [PATCH 1/3] feat: implement custom script

---
 Dockerfile      |  2 ++
 custom-start.sh | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 custom-start.sh

diff --git a/Dockerfile b/Dockerfile
index 9546e0371e..59e66f7bf2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,8 @@ FROM nginx:1.21.4-alpine
 RUN rm -rf /usr/share/nginx/html/*
 COPY dist/apps/datafeeder /usr/share/nginx/html
 COPY nginx-default.conf /etc/nginx/conf.d/default.conf
+COPY custom-start.sh /custom-start.sh
 EXPOSE 80
 
+ENTRYPOINT ["sh", "/custom-start.sh", "sh", "/docker-entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/custom-start.sh b/custom-start.sh
new file mode 100755
index 0000000000..ad633ce472
--- /dev/null
+++ b/custom-start.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+DIR=/docker-entrypoint.d
+
+# Executing custom scripts located in CUSTOM_SCRIPTS_DIRECTORY if environment variable is set
+if [[ -z "${CUSTOM_SCRIPTS_DIRECTORY}" ]]; then
+  echo "[INFO] No CUSTOM_SCRIPTS_DIRECTORY env variable set"
+else
+  echo "[INFO] CUSTOM_SCRIPTS_DIRECTORY env variable set to ${CUSTOM_SCRIPTS_DIRECTORY}"
+  cp -v "${CUSTOM_SCRIPTS_DIRECTORY}"/* "$DIR"
+  echo "[INFO] End copying custom scripts"
+fi
+
+if [[ -d "$DIR" ]]
+then
+  # No regex and verbose in this image
+  /bin/run-parts "$DIR"
+fi
+
+exec "$@"

From d68ba0304ce3d0559fb38218a0af4e78717d0ddb Mon Sep 17 00:00:00 2001
From: Emilien Devos <emilien.devos@camptocamp.com>
Date: Fri, 1 Dec 2023 14:44:43 +0100
Subject: [PATCH 2/3] change entrypoint name + fix entrypoint command

---
 Dockerfile                                     | 4 ++--
 custom-start.sh => docker/docker-entrypoint.sh | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename custom-start.sh => docker/docker-entrypoint.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index 59e66f7bf2..23731a2482 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM nginx:1.21.4-alpine
 RUN rm -rf /usr/share/nginx/html/*
 COPY dist/apps/datafeeder /usr/share/nginx/html
 COPY nginx-default.conf /etc/nginx/conf.d/default.conf
-COPY custom-start.sh /custom-start.sh
+COPY docker/docker-entrypoint.sh /docker-entrypoint.sh
 EXPOSE 80
 
-ENTRYPOINT ["sh", "/custom-start.sh", "sh", "/docker-entrypoint.sh"]
+ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/custom-start.sh b/docker/docker-entrypoint.sh
similarity index 100%
rename from custom-start.sh
rename to docker/docker-entrypoint.sh

From e1a095bfdecd17a487b5f856495eb85684649297 Mon Sep 17 00:00:00 2001
From: Emilien Devos <emilien.devos@camptocamp.com>
Date: Fri, 1 Dec 2023 16:14:36 +0100
Subject: [PATCH 3/3] let execution logic in upstream /docker-entrypoint.sh

---
 Dockerfile                                              | 4 ++--
 docker/{docker-entrypoint.sh => copy-custom-scripts.sh} | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)
 rename docker/{docker-entrypoint.sh => copy-custom-scripts.sh} (80%)

diff --git a/Dockerfile b/Dockerfile
index 23731a2482..561d04f5e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM nginx:1.21.4-alpine
 RUN rm -rf /usr/share/nginx/html/*
 COPY dist/apps/datafeeder /usr/share/nginx/html
 COPY nginx-default.conf /etc/nginx/conf.d/default.conf
-COPY docker/docker-entrypoint.sh /docker-entrypoint.sh
+COPY docker/copy-custom-scripts.sh /copy-custom-scripts.sh
 EXPOSE 80
 
-ENTRYPOINT ["/docker-entrypoint.sh"]
+ENTRYPOINT ["/copy-custom-scripts.sh"]
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker/docker-entrypoint.sh b/docker/copy-custom-scripts.sh
similarity index 80%
rename from docker/docker-entrypoint.sh
rename to docker/copy-custom-scripts.sh
index ad633ce472..2e75d62554 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/copy-custom-scripts.sh
@@ -11,10 +11,4 @@ else
   echo "[INFO] End copying custom scripts"
 fi
 
-if [[ -d "$DIR" ]]
-then
-  # No regex and verbose in this image
-  /bin/run-parts "$DIR"
-fi
-
-exec "$@"
+exec /docker-entrypoint.sh "$@"