ThunderNetworkRaD/yolks
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert timezone changes, switch user back to container

Browse source
This commit is contained in:
Matthew Penner 2020-11-15 13:52:49 -07:00
parent 0859211185
commit c9fd17ef42
18 changed files with 36 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alpine/Dockerfile
View file

@ -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" ]

10
alpine/entrypoint.sh
View file

@ -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}

4
java10/Dockerfile
View file

@ -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" ]

10
java10/entrypoint.sh
View file

@ -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}

4
java11/Dockerfile
View file

@ -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" ]

10
java11/entrypoint.sh
View file

@ -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}

4
java12/Dockerfile
View file

@ -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" ]

10
java12/entrypoint.sh
View file

@ -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}

4
java13/Dockerfile
View file

@ -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" ]

10
java13/entrypoint.sh
View file

@ -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}

4
java14/Dockerfile
View file

@ -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" ]

10
java14/entrypoint.sh
View file

@ -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}

4
java7/Dockerfile
View file

@ -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" ]

10
java7/entrypoint.sh
View file

@ -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}

4
java8/Dockerfile
View file

@ -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" ]

10
java8/entrypoint.sh
View file

@ -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}

4
java9/Dockerfile
View file

@ -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" ]

10
java9/entrypoint.sh
View file

@ -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}