-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
backport custom scripts changes to 2022.02.xx
- Loading branch information
Showing
3 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,3 +15,5 @@ coverage/ | |
backend/.classpath | ||
backend/.project | ||
package-lock.json | ||
.idea/ | ||
docker/*.war |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ RUN unzip mapstore.war -d mapstore | |
FROM tomcat:9-jdk11-openjdk | ||
MAINTAINER geosolutions<[email protected]> | ||
|
||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 "$@" |