Merge pull request #266 from edevosc2c/georchestra-gn4.2.x-23.0.x

georchestra · Dec 6, 2023 · eec24be · eec24be
2 parents 67c0205 + a368a7d
commit eec24be
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/web/src/docker/Dockerfile b/web/src/docker/Dockerfile
@@ -9,6 +9,8 @@ COPY --chown=jetty:jetty . /
 # Temporary switch to root
 USER root
 
+RUN mkdir -p /docker-entrypoint.d
+RUN chown jetty:jetty /docker-entrypoint.d
 RUN mkdir -p /mnt/geonetwork_datadir && \
     chown jetty:jetty /mnt/geonetwork_datadir
 

diff --git a/web/src/docker/docker-entrypoint.sh b/web/src/docker/docker-entrypoint.sh
@@ -2,9 +2,19 @@
 
 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
-  /bin/run-parts --verbose "$DIR"
+  # Regex is needed to execute all kind of files, including sh files. Warning : --regex not available in alpine images.
+  /bin/run-parts --verbose "$DIR" --regex='.*'
 fi
 
 exec "$@"