Revert timezone changes, switch user back to container

alpine/Dockerfile

@@ -12,7 +12,9 @@ LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 RUN         apk add --update --no-cache ca-certificates tzdata \
 				&& adduser -D -h /home/container container
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

alpine/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -30,4 +22,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java10/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java10/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java11/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java11/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java12/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java12/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java13/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java13/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java14/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java14/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java7/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java7/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java8/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java8/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}

java9/Dockerfile

@@ -12,7 +12,9 @@ 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
 
-USER        root
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
 CMD         [ "/bin/ash", "/entrypoint.sh" ]

java9/entrypoint.sh

@@ -11,15 +11,7 @@
 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
@@ -33,4 +25,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
 
 # Run the startup command
-su -c "eval ${MODIFIED_STARTUP}" container
+eval ${MODIFIED_STARTUP}