Merge pull request #669 from georchestra/startup-script

Enhance custom-scripts (#671)

* feat: add custom scripts support in entrypoint.sh

* fix: update command in comment

* fix: remove comment

.gitignore

@@ -15,3 +15,5 @@ coverage/
 backend/.classpath
 backend/.project
 package-lock.json
+.idea/
+docker/*.war

Dockerfile

@@ -8,6 +8,7 @@ RUN unzip mapstore.war -d mapstore
 FROM tomcat:9-jdk11-openjdk
 MAINTAINER geosolutions<info@geo-solutions.it>
 
+RUN mkdir -p /docker-entrypoint.d
 # Tomcat specific options
 ENV CATALINA_BASE "$CATALINA_HOME"
 ENV JAVA_OPTS="${JAVA_OPTS}  -Xms512m -Xmx512m -XX:MaxPermSize=128m"
@@ -20,6 +21,8 @@ RUN if [ "$TOMCAT_EXTRAS" = false ]; then \
 
 # Add application from first stage
 COPY --from=extractwar /tmp/mapstore "${CATALINA_BASE}/webapps/mapstore"
+COPY georchestra-docker-scripts/ /
+
 
 # Geostore externalization template. Disabled by default
 # COPY docker/geostore-datasource-ovr.properties "${CATALINA_BASE}/conf/"
@@ -30,4 +33,7 @@ ENV JAVA_OPTS="${JAVA_OPTS} ${GEORCHESTRA_DATADIR_OPT}"
 # Set variable to better handle terminal commands
 ENV TERM xterm
 
+# Necessary to execute tomcat and custom scripts
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["catalina.sh", "run"]
 EXPOSE 8080

georchestra-docker-scripts/docker-entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+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
+  # 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 "$@"