From e5041bcf9a261bb6349363475a9cbeddc15e13e3 Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Fri, 26 Mar 2021 20:53:15 -0600 Subject: [PATCH] add java16 image --- .github/workflows/docker-publish.yml | 1 + README.md | 3 ++ java16/Dockerfile | 38 ++++++++++++++++++++++++ java16/entrypoint.sh | 44 ++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 java16/Dockerfile create mode 100644 java16/entrypoint.sh diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index ac2c73e..ba560a1 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -30,6 +30,7 @@ jobs: - "java13" - "java14" - "java15" + - "java16" - "source" - "source-install" diff --git a/README.md b/README.md index f3fa9e7..2e4b1c3 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,9 @@ these images on an arm system, no modification to them or the tag is needed, the - [`java15`](https://github.com/matthewpi/images/tree/master/java15) - `ghcr.io/matthewpi/images:java15` - `quay.io/matthewp/pterodactyl:java15` +- [`java16`](https://github.com/matthewpi/images/tree/master/java16) + - `ghcr.io/matthewpi/images:java16` + - `quay.io/matthewp/pterodactyl:java16` - [`source`](https://github.com/matthewpi/images/tree/master/source) - `ghcr.io/matthewpi/images:source` - `quay.io/matthewp/pterodactyl:source` diff --git a/java16/Dockerfile b/java16/Dockerfile new file mode 100644 index 0000000..b3742e7 --- /dev/null +++ b/java16/Dockerfile @@ -0,0 +1,38 @@ +# +# Copyright (c) 2021 Matthew Penner +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + +FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:alpine + +LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" + +LABEL org.opencontainers.image.source="https://github.com/matthewpi/images" +LABEL org.opencontainers.image.licenses=MIT + +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/java16/entrypoint.sh b/java16/entrypoint.sh new file mode 100644 index 0000000..b17dd93 --- /dev/null +++ b/java16/entrypoint.sh @@ -0,0 +1,44 @@ +#!/bin/ash + +# +# Copyright (c) 2021 Matthew Penner +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# + +# 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')` +printf '\033[1m\033[33mcontainer@pterodactyl~ \033[0m' +echo "${MODIFIED_STARTUP}" + +# Run the startup command +exec ${MODIFIED_STARTUP}