From 72443f7789a6656e773cd1d6187be6124cbe0512 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sat, 15 May 2021 11:53:37 -0700 Subject: [PATCH] Reorganize java and add build action for it --- .github/workflows/java.yml | 39 ++++++++++++++++++++++++++++++ {java11 => java/11}/Dockerfile | 2 +- {java14 => java/14}/Dockerfile | 2 +- {java16 => java/16}/Dockerfile | 2 +- {java7 => java/7}/Dockerfile | 2 +- {java8 => java/8}/Dockerfile | 2 +- {java9 => java/9}/Dockerfile | 2 +- {java12 => java}/entrypoint.sh | 13 +++++----- java10/Dockerfile | 38 ----------------------------- java10/entrypoint.sh | 44 ---------------------------------- java11/entrypoint.sh | 44 ---------------------------------- java12/Dockerfile | 38 ----------------------------- java13/Dockerfile | 38 ----------------------------- java13/entrypoint.sh | 44 ---------------------------------- java14/entrypoint.sh | 44 ---------------------------------- java15/Dockerfile | 38 ----------------------------- java15/entrypoint.sh | 44 ---------------------------------- java16/entrypoint.sh | 44 ---------------------------------- java7/entrypoint.sh | 44 ---------------------------------- java8/entrypoint.sh | 44 ---------------------------------- java9/entrypoint.sh | 44 ---------------------------------- 21 files changed, 52 insertions(+), 560 deletions(-) create mode 100644 .github/workflows/java.yml rename {java11 => java/11}/Dockerfile (97%) rename {java14 => java/14}/Dockerfile (97%) rename {java16 => java/16}/Dockerfile (97%) rename {java7 => java/7}/Dockerfile (97%) rename {java8 => java/8}/Dockerfile (97%) rename {java9 => java/9}/Dockerfile (97%) rename {java12 => java}/entrypoint.sh (86%) delete mode 100644 java10/Dockerfile delete mode 100644 java10/entrypoint.sh delete mode 100644 java11/entrypoint.sh delete mode 100644 java12/Dockerfile delete mode 100644 java13/Dockerfile delete mode 100644 java13/entrypoint.sh delete mode 100644 java14/entrypoint.sh delete mode 100644 java15/Dockerfile delete mode 100644 java15/entrypoint.sh delete mode 100644 java16/entrypoint.sh delete mode 100644 java7/entrypoint.sh delete mode 100644 java8/entrypoint.sh delete mode 100644 java9/entrypoint.sh diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml new file mode 100644 index 0000000..1097376 --- /dev/null +++ b/.github/workflows/java.yml @@ -0,0 +1,39 @@ +on: + push: + branches: + - master + paths: + - java/* + +jobs: + push: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tag: + - 7 + - 8 + - 9 + - 11 + - 14 + - 16 + steps: + - uses: actions/checkout@v2 + - uses: docker/setup-buildx-action@v1 + with: + version: "v0.5.1" + buildkitd-flags: --debug + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.REGISTRY_TOKEN }} + - uses: docker/build-push-action@v2 + with: + context: ./java + file: ./java/${{ matrix.tag }}/Dockerfile + platforms: linux/amd64 + push: true + tags: | + ghcr.io/pterodactyl/yolks:java_${{ matrix.tag }} diff --git a/java11/Dockerfile b/java/11/Dockerfile similarity index 97% rename from java11/Dockerfile rename to java/11/Dockerfile index 57e7850..dd6c055 100644 --- a/java11/Dockerfile +++ b/java/11/Dockerfile @@ -34,5 +34,5 @@ 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" ] diff --git a/java14/Dockerfile b/java/14/Dockerfile similarity index 97% rename from java14/Dockerfile rename to java/14/Dockerfile index c2755c6..a12aadc 100644 --- a/java14/Dockerfile +++ b/java/14/Dockerfile @@ -34,5 +34,5 @@ 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" ] diff --git a/java16/Dockerfile b/java/16/Dockerfile similarity index 97% rename from java16/Dockerfile rename to java/16/Dockerfile index b27a02a..395702b 100644 --- a/java16/Dockerfile +++ b/java/16/Dockerfile @@ -34,5 +34,5 @@ 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" ] diff --git a/java7/Dockerfile b/java/7/Dockerfile similarity index 97% rename from java7/Dockerfile rename to java/7/Dockerfile index e22a7ca..7dcba1f 100644 --- a/java7/Dockerfile +++ b/java/7/Dockerfile @@ -34,5 +34,5 @@ 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" ] diff --git a/java8/Dockerfile b/java/8/Dockerfile similarity index 97% rename from java8/Dockerfile rename to java/8/Dockerfile index 48f66e5..70a6cf6 100644 --- a/java8/Dockerfile +++ b/java/8/Dockerfile @@ -34,5 +34,5 @@ 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" ] diff --git a/java9/Dockerfile b/java/9/Dockerfile similarity index 97% rename from java9/Dockerfile rename to java/9/Dockerfile index 4c60320..8c4f4f9 100644 --- a/java9/Dockerfile +++ b/java/9/Dockerfile @@ -34,5 +34,5 @@ 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" ] diff --git a/java12/entrypoint.sh b/java/entrypoint.sh similarity index 86% rename from java12/entrypoint.sh rename to java/entrypoint.sh index 55ff100..4511dab 100644 --- a/java12/entrypoint.sh +++ b/java/entrypoint.sh @@ -26,19 +26,20 @@ 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}'` +INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}') +export INTERNAL_IP + +# Switch to the container's working directory +cd /home/container || exit 1 # Print Java version java -version # Replace variables in the startup command -MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` +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 env ${MODIFIED_STARTUP} +exec env "${MODIFIED_STARTUP}" diff --git a/java10/Dockerfile b/java10/Dockerfile deleted file mode 100644 index 7b032cd..0000000 --- a/java10/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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/openjdk10-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 ca-certificates curl fontconfig git openssl sqlite tar 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/java10/entrypoint.sh b/java10/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java10/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java11/entrypoint.sh b/java11/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java11/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java12/Dockerfile b/java12/Dockerfile deleted file mode 100644 index 2b23677..0000000 --- a/java12/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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/openjdk12-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 ca-certificates curl fontconfig git openssl sqlite tar 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/java13/Dockerfile b/java13/Dockerfile deleted file mode 100644 index f49beac..0000000 --- a/java13/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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/openjdk13-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 ca-certificates curl fontconfig git openssl sqlite tar 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/java13/entrypoint.sh b/java13/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java13/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java14/entrypoint.sh b/java14/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java14/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java15/Dockerfile b/java15/Dockerfile deleted file mode 100644 index d9dd7fd..0000000 --- a/java15/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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/openjdk15-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 ca-certificates curl fontconfig git openssl sqlite tar 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 deleted file mode 100644 index 55ff100..0000000 --- a/java15/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java16/entrypoint.sh b/java16/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java16/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java7/entrypoint.sh b/java7/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java7/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java8/entrypoint.sh b/java8/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java8/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP} diff --git a/java9/entrypoint.sh b/java9/entrypoint.sh deleted file mode 100644 index 55ff100..0000000 --- a/java9/entrypoint.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/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 env ${MODIFIED_STARTUP}