diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 4afb623..1d456e8 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -19,6 +19,7 @@ jobs: matrix: image: - "alpine" + - "source" - "java7" - "java8" - "java9" @@ -27,7 +28,7 @@ jobs: - "java12" - "java13" - "java14" - - "source" + - "java15" steps: - name: Code Checkout diff --git a/java15/Dockerfile b/java15/Dockerfile new file mode 100644 index 0000000..a0a9e9d --- /dev/null +++ b/java15/Dockerfile @@ -0,0 +1,20 @@ +# +# Copyright (c) 2020 Matthew Penner +# +# This repository is licensed under the MIT License. +# https://github.com/matthewpi/images/blob/master/LICENSE.md +# + +FROM adoptopenjdk/openjdk15-openj9:alpine + +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 container +ENV USER=container HOME=/home/container +WORKDIR /home/container + +COPY ./entrypoint.sh /entrypoint.sh +CMD [ "/bin/ash", "/entrypoint.sh" ] diff --git a/java15/entrypoint.sh b/java15/entrypoint.sh new file mode 100644 index 0000000..1f5f5f7 --- /dev/null +++ b/java15/entrypoint.sh @@ -0,0 +1,28 @@ +#!/bin/ash + +# +# Copyright (c) 2020 Matthew Penner +# +# This repository is licensed under the MIT License. +# https://github.com/matthewpi/images/blob/master/LICENSE.md +# + +# Default the TZ environment variable to UTC. +TZ=${TZ:-UTC} +export TZ + +# Switch to the container's working directory +cd /home/container + +# Set environment variable that holds the Internal Docker IP +export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'` + +# Print Java version +java -version + +# 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 startup command +eval ${MODIFIED_STARTUP}