Attempt to fix timezone problems with images

java14/Dockerfile

@@ -7,15 +7,10 @@
 
 FROM        adoptopenjdk/openjdk14-openj9:alpine
 
-LABEL       author="Matthew Penner" maintainer="me@matthewp.io"
+LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
 RUN         apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
-			    && adduser -D -h /home/container container \
-			    && ln -s /etc/localtime /etc/timezone
-
-USER        container
-ENV         USER=container HOME=/home/container
-WORKDIR     /home/container
+			    && adduser -D -h /home/container container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java14/entrypoint.sh

@@ -7,6 +7,19 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
+# Default the TZ environment variable to UTC.
+TZ=${TZ:-UTC}
+export TZ
+
+# Set the timezone in the container
+echo $TZ > /etc/timezone
+ln -s ../usr/share/zoneinfo/$TZ /etc/localtime
+
+# Switch to the container's working directory
+USER=container
+HOME=/home/container
+export USER
+export HOME
 cd /home/container
 
 # Set environment variable that holds the Internal Docker IP
@@ -15,9 +28,9 @@ export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
 # Print Java version
 java -version
 
-# Replace start command variables
-MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
-echo "[container@pterodactyl ~]$ ${MODIFIED_START}"
+# Replace variables in the startup command
+MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
+echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
-# Run the modified start command
-eval ${MODIFIED_START}
+# Run the startup command
+su -c "eval ${MODIFIED_STARTUP}" container