devbeni/yolks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: migrate all java images from alpine to debian

Browse Source
This commit is contained in:
Softwarenoob
2021-08-22 04:44:01 +03:00
parent 4884c6728b
commit 86a97cf362
7 changed files with 47 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
java/11/Dockerfile
View File

@@ -1,38 +1,17 @@
# FROM --platform=$BUILDPLATFORM openjdk:11-slim
# 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: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.source="https://github.com/pterodactyl/yolks"
LABEL org.opencontainers.image.licenses=MIT LABEL org.opencontainers.image.licenses=MIT
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \ RUN apt-get update -y \
&& adduser -D -h /home/container container && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
&& useradd -d /home/container -m container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/bash", "/entrypoint.sh" ]

40
java/11j9/Dockerfile
View File

@@ -1,38 +1,16 @@
# FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:debianslim
# 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:alpine-jre LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" && useradd -d /home/container -m container
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 USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ]
CMD ["/bin/bash", "/entrypoint.sh"]

33
java/16/Dockerfile
View File

@@ -1,38 +1,17 @@
# FROM --platform=$BUILDPLATFORM openjdk:16-slim
# 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: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.source="https://github.com/pterodactyl/yolks"
LABEL org.opencontainers.image.licenses=MIT LABEL org.opencontainers.image.licenses=MIT
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \ RUN apt-get update -y \
&& adduser -D -h /home/container container && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
&& useradd -d /home/container -m container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/bash", "/entrypoint.sh" ]

40
java/16j9/Dockerfile
View File

@@ -1,38 +1,16 @@
# FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:debianslim
# 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-jre LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" && useradd -d /home/container -m container
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 USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ]
CMD ["/bin/bash", "/entrypoint.sh"]

33
java/8/Dockerfile
View File

@@ -1,38 +1,17 @@
# FROM --platform=$BUILDPLATFORM openjdk:8-slim-buster
# 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: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.source="https://github.com/pterodactyl/yolks"
LABEL org.opencontainers.image.licenses=MIT LABEL org.opencontainers.image.licenses=MIT
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \ RUN apt-get update -y \
&& adduser -D -h /home/container container && apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
&& useradd -d /home/container -m container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ] CMD [ "/bin/bash", "/entrypoint.sh" ]

40
java/8j9/Dockerfile
View File

@@ -1,38 +1,16 @@
# FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:debianslim
# 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:alpine-jre LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" RUN apt-get update -y \
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks" && useradd -d /home/container -m container
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 USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/ash", "/entrypoint.sh" ]
CMD ["/bin/bash", "/entrypoint.sh"]

4
java/entrypoint.sh
View File

@@ -1,4 +1,4 @@
#!/bin/ash #!/bin/bash
# #
# Copyright (c) 2021 Matthew Penner # Copyright (c) 2021 Matthew Penner
@@ -20,7 +20,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # 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 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
# #
# Default the TZ environment variable to UTC. # Default the TZ environment variable to UTC.
TZ=${TZ:-UTC} TZ=${TZ:-UTC}