Skip to content
Permalink
Browse files

Add TIMEZONE parameter

  • Loading branch information
mederly committed Oct 5, 2018
1 parent f622edc commit e7679b6dde7d85daf758f3fc6b4675f9f862b14b
@@ -29,6 +29,7 @@ COPY container_files/opt-tier/* /opt/tier/
RUN chmod 755 /opt/tier/setenv.sh \ RUN chmod 755 /opt/tier/setenv.sh \
&& chmod 755 /usr/local/bin/sendtierbeacon.sh \ && chmod 755 /usr/local/bin/sendtierbeacon.sh \
&& chmod 755 /usr/local/bin/setup-cron.sh \ && chmod 755 /usr/local/bin/setup-cron.sh \
&& chmod 755 /usr/local/bin/setup-timezone.sh \
&& chmod 755 /usr/local/bin/start-midpoint.sh \ && chmod 755 /usr/local/bin/start-midpoint.sh \
&& chmod 755 /usr/local/bin/start-httpd.sh \ && chmod 755 /usr/local/bin/start-httpd.sh \
&& chmod 755 /usr/local/bin/startup.sh \ && chmod 755 /usr/local/bin/startup.sh \
@@ -93,6 +94,7 @@ ENV LOGOUT_URL https://localhost:8443/Shibboleth.sso/Logout
ENV MP_KEYSTORE_PASSWORD_FILE /run/secrets/mp_keystore_password.txt ENV MP_KEYSTORE_PASSWORD_FILE /run/secrets/mp_keystore_password.txt
ENV MP_MEM_MAX 2048m ENV MP_MEM_MAX 2048m
ENV MP_MEM_INIT 1024m ENV MP_MEM_INIT 1024m
ENV TIMEZONE UTC
ENV TIER_RELEASE not-released-yet ENV TIER_RELEASE not-released-yet
ENV TIER_MAINTAINER tier ENV TIER_MAINTAINER tier


@@ -0,0 +1,13 @@
#!/bin/bash

if [[ -n $TIMEZONE ]]; then
echo "*** Setting timezone to '$TIMEZONE'"
if [[ -e /usr/share/zoneinfo/$TIMEZONE ]]; then
unlink /etc/localtime
ln -s /usr/share/zoneinfo/$TIMEZONE /etc/localtime
echo "date (UTC) is: $(date -u)"
echo "date (current timezone) is $(date)"
else
echo "Error: time zone '$TIMEZONE' is unknown; not setting it."
fi
fi
@@ -39,7 +39,6 @@ java -Xmx$MP_MEM_MAX -Xms$MP_MEM_INIT -Dfile.encoding=UTF8 \
-Dmidpoint.keystore.keyStorePassword_FILE=$MP_KEYSTORE_PASSWORD_FILE \ -Dmidpoint.keystore.keyStorePassword_FILE=$MP_KEYSTORE_PASSWORD_FILE \
-Dmidpoint.logging.alt.enabled=true \ -Dmidpoint.logging.alt.enabled=true \
-Dmidpoint.logging.alt.filename=/tmp/logmidpoint \ -Dmidpoint.logging.alt.filename=/tmp/logmidpoint \
-Dmidpoint.logging.alt.timezone=UTC \
-Dspring.profiles.active="`$MP_DIR/active-spring-profiles`" \ -Dspring.profiles.active="`$MP_DIR/active-spring-profiles`" \
$(if [ "$AUTHENTICATION" = "shibboleth" ]; then echo "-Dauth.logout.url=$LOGOUT_URL -Dauth.sso.header=$SSO_HEADER"; fi) \ $(if [ "$AUTHENTICATION" = "shibboleth" ]; then echo "-Dauth.logout.url=$LOGOUT_URL -Dauth.sso.header=$SSO_HEADER"; fi) \
-Dserver.tomcat.ajp.enabled=$AJP_ENABLED \ -Dserver.tomcat.ajp.enabled=$AJP_ENABLED \
@@ -4,6 +4,8 @@
export ENV=${ENV//[; ]/_} export ENV=${ENV//[; ]/_}
export USERTOKEN=${USERTOKEN//[; ]/_} export USERTOKEN=${USERTOKEN//[; ]/_}


/usr/local/bin/setup-timezone.sh

# this is to be executed at run time, not at build time -- to ensure sufficient variability of execution times # this is to be executed at run time, not at build time -- to ensure sufficient variability of execution times
/usr/local/bin/setup-cron.sh /usr/local/bin/setup-cron.sh


@@ -11,3 +11,4 @@ REPO_UPGRADEABLE_SCHEMA_ACTION=stop
MP_MEM_MAX=2048m MP_MEM_MAX=2048m
MP_MEM_INIT=1024m MP_MEM_INIT=1024m
SSO_HEADER=uid SSO_HEADER=uid
TIMEZONE=UTC
@@ -157,6 +157,7 @@ services:
- MP_JAVA_OPTS - MP_JAVA_OPTS
- SSO_HEADER - SSO_HEADER
- TIER_BEACON_OPT_OUT - TIER_BEACON_OPT_OUT
- TIMEZONE
networks: networks:
- net - net
secrets: secrets:
@@ -7,3 +7,4 @@ REPO_MISSING_SCHEMA_ACTION=create
REPO_UPGRADEABLE_SCHEMA_ACTION=stop REPO_UPGRADEABLE_SCHEMA_ACTION=stop
MP_MEM_MAX=2048m MP_MEM_MAX=2048m
MP_MEM_INIT=1024m MP_MEM_INIT=1024m
TIMEZONE=UTC
@@ -22,6 +22,7 @@ services:
- MP_MEM_INIT - MP_MEM_INIT
- MP_JAVA_OPTS - MP_JAVA_OPTS
- TIER_BEACON_OPT_OUT - TIER_BEACON_OPT_OUT
- TIMEZONE
networks: networks:
- net - net
secrets: secrets:
@@ -5,3 +5,4 @@ REPO_MISSING_SCHEMA_ACTION=create
REPO_UPGRADEABLE_SCHEMA_ACTION=stop REPO_UPGRADEABLE_SCHEMA_ACTION=stop
MP_MEM_MAX=2048m MP_MEM_MAX=2048m
MP_MEM_INIT=1024m MP_MEM_INIT=1024m
TIMEZONE=UTC
@@ -35,6 +35,7 @@ services:
- MP_MEM_INIT - MP_MEM_INIT
- MP_JAVA_OPTS - MP_JAVA_OPTS
- TIER_BEACON_OPT_OUT - TIER_BEACON_OPT_OUT
- TIMEZONE
networks: networks:
- net - net
secrets: secrets:
@@ -12,3 +12,5 @@ REPO_MISSING_SCHEMA_ACTION=create
REPO_UPGRADEABLE_SCHEMA_ACTION=stop REPO_UPGRADEABLE_SCHEMA_ACTION=stop
MP_MEM_MAX=2048m MP_MEM_MAX=2048m
MP_MEM_INIT=1024m MP_MEM_INIT=1024m
TIMEZONE=UTC

@@ -36,6 +36,7 @@ services:
- MP_MEM_INIT - MP_MEM_INIT
- MP_JAVA_OPTS - MP_JAVA_OPTS
- TIER_BEACON_OPT_OUT - TIER_BEACON_OPT_OUT
- TIMEZONE
networks: networks:
- net - net
secrets: secrets:
@@ -11,3 +11,4 @@ REPO_MISSING_SCHEMA_ACTION=create
REPO_UPGRADEABLE_SCHEMA_ACTION=stop REPO_UPGRADEABLE_SCHEMA_ACTION=stop
MP_MEM_MAX=2048m MP_MEM_MAX=2048m
MP_MEM_INIT=1024m MP_MEM_INIT=1024m
TIMEZONE=UTC
@@ -34,6 +34,7 @@ services:
- MP_MEM_INIT - MP_MEM_INIT
- MP_JAVA_OPTS - MP_JAVA_OPTS
- TIER_BEACON_OPT_OUT - TIER_BEACON_OPT_OUT
- TIMEZONE
networks: networks:
- net - net
secrets: secrets:

0 comments on commit e7679b6

Please sign in to comment.
You can’t perform that action at this time.