Revert timezone changes, switch user back to container
This commit is contained in:
@@ -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" ]
|
||||
|
@@ -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}
|
||||
|
Reference in New Issue
Block a user