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

Attempt to fix timezone problems with images

Browse source
This commit is contained in:
Matthew Penner 2020-10-25 11:23:45 -06:00
parent 83c50f6415
commit 9087c245bc
20 changed files with 182 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.editorconfig
View file

@ -2,7 +2,7 @@
root = true root = true
[*] [*]
indent_style = space indent_style = tab
indent_size = 4 indent_size = 4
tab_width = 4 tab_width = 4
end_of_line = lf end_of_line = lf
@ -14,5 +14,6 @@ insert_final_newline = true
trim_trailing_whitespace = false trim_trailing_whitespace = false
[*.yml] [*.yml]
indent_style = space
indent_size = 2 indent_size = 2
tab_width = 2 tab_width = 2

1
.gitignore vendored
View file

@ -1,2 +1 @@
.DS_Store .DS_Store

9
alpine/Dockerfile
View file

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

23
alpine/entrypoint.sh
View file

@ -7,14 +7,27 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # Set environment variable that holds the Internal Docker IP
export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java10/Dockerfile
View file

@ -7,15 +7,10 @@
FROM adoptopenjdk/openjdk10-openj9:alpine FROM adoptopenjdk/openjdk10-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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java10/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java11/Dockerfile
View file

@ -7,15 +7,10 @@
FROM adoptopenjdk/openjdk11-openj9:alpine FROM adoptopenjdk/openjdk11-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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java11/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java12/Dockerfile
View file

@ -7,15 +7,10 @@
FROM adoptopenjdk/openjdk12-openj9:alpine FROM adoptopenjdk/openjdk12-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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java12/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java13/Dockerfile
View file

@ -7,15 +7,10 @@
FROM adoptopenjdk/openjdk13-openj9:alpine FROM adoptopenjdk/openjdk13-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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java13/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java14/Dockerfile
View file

@ -7,15 +7,10 @@
FROM adoptopenjdk/openjdk14-openj9:alpine 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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java14/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java7/Dockerfile
View file

@ -7,15 +7,10 @@
FROM openjdk:7-jre-alpine FROM openjdk:7-jre-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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java7/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java8/Dockerfile
View file

@ -7,15 +7,10 @@
FROM ibmjava:8-jre-alpine FROM ibmjava:8-jre-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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java8/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container

9
java9/Dockerfile
View file

@ -7,15 +7,10 @@
FROM adoptopenjdk/openjdk9-openj9:alpine FROM adoptopenjdk/openjdk9-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 \ RUN apk add --update --no-cache curl ca-certificates openssl git tar bash sqlite fontconfig tzdata \
&& adduser -D -h /home/container container \ && adduser -D -h /home/container container
&& ln -s /etc/localtime /etc/timezone
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/ash", "/entrypoint.sh" ]

23
java9/entrypoint.sh
View file

@ -7,6 +7,19 @@
# https://github.com/matthewpi/images/blob/master/LICENSE.md # 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 cd /home/container
# Set environment variable that holds the Internal Docker IP # 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 # Print Java version
java -version java -version
# Replace start command variables # Replace variables in the startup command
MODIFIED_START=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
echo "[container@pterodactyl ~]$ ${MODIFIED_START}" echo "[container@pterodactyl ~]$ ${MODIFIED_STARTUP}"
# Run the modified start command # Run the startup command
eval ${MODIFIED_START} su -c "eval ${MODIFIED_STARTUP}" container