diff --git a/java/11/Dockerfile b/java/11/Dockerfile index ce33f29..16f2e0e 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -1,38 +1,17 @@ -# -# 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 openjdk:11-slim -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:alpine-jre - -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" 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 +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile index a566bfa..6a401a5 100644 --- a/java/11j9/Dockerfile +++ b/java/11j9/Dockerfile @@ -1,38 +1,16 @@ -# -# 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/openjdk11-openj9:debianslim -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine-jre +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" - -LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" -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 +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container + WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +COPY ./entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/java/16/Dockerfile b/java/16/Dockerfile index 88a6f1e..17687aa 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -1,38 +1,17 @@ -# -# 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 openjdk:16-slim -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16:alpine-jre - -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" 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 +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile index 3e9bca8..6ae6c83 100644 --- a/java/16j9/Dockerfile +++ b/java/16j9/Dockerfile @@ -1,38 +1,16 @@ -# -# 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:debianslim -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:alpine-jre +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" - -LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" -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 +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container + WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +COPY ./entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/java/8/Dockerfile b/java/8/Dockerfile index ca967be..e220ce6 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -1,38 +1,17 @@ -# -# 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 openjdk:8-slim-buster -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8:alpine-jre - -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" 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 +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container WORKDIR /home/container COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +CMD [ "/bin/bash", "/entrypoint.sh" ] diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile index 4b7be91..62fe586 100644 --- a/java/8j9/Dockerfile +++ b/java/8j9/Dockerfile @@ -1,38 +1,16 @@ -# -# 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/openjdk8-openj9:debianslim -FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:alpine-jre +LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" - -LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" -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 +RUN apt-get update -y \ + && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \ + && useradd -d /home/container -m container USER container ENV USER=container HOME=/home/container + WORKDIR /home/container -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/ash", "/entrypoint.sh" ] +COPY ./entrypoint.sh /entrypoint.sh + +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/java/entrypoint.sh b/java/entrypoint.sh index 92f887e..012d126 100644 --- a/java/entrypoint.sh +++ b/java/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/bash # # Copyright (c) 2021 Matthew Penner @@ -20,7 +20,7 @@ # 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}