Skip to content

Commit 86a97cf

Browse files
trenutootrenutoo
committed
feat: migrate all java images from alpine to debian
1 parent 4884c67 commit 86a97cf

File tree

7 files changed

+47
-176
lines changed

7 files changed

+47
-176
lines changed

‎java/11/Dockerfile‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
1-
#
2-
# Copyright (c) 2021 Matthew Penner
3-
#
4-
# Permission is hereby granted, free of charge, to any person obtaining a copy
5-
# of this software and associated documentation files (the "Software"), to deal
6-
# in the Software without restriction, including without limitation the rights
7-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
# copies of the Software, and to permit persons to whom the Software is
9-
# furnished to do so, subject to the following conditions:
10-
#
11-
# The above copyright notice and this permission notice shall be included in all
12-
# copies or substantial portions of the Software.
13-
#
14-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
# SOFTWARE.
21-
#
1+
FROM --platform=$BUILDPLATFORM openjdk:11-slim
222

23-
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:alpine-jre
24-
25-
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
3+
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
264

275
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
286
LABEL org.opencontainers.image.licenses=MIT
297

30-
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \
31-
&& adduser -D -h /home/container container
8+
RUN apt-get update -y \
9+
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
10+
&& useradd -d /home/container -m container
3211

3312
USER container
3413
ENV USER=container HOME=/home/container
3514
WORKDIR /home/container
3615

3716
COPY ./../entrypoint.sh /entrypoint.sh
38-
CMD [ "/bin/ash", "/entrypoint.sh" ]
17+
CMD [ "/bin/bash", "/entrypoint.sh" ]

‎java/11j9/Dockerfile‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,16 @@
1-
#
2-
# Copyright (c) 2021 Matthew Penner
3-
#
4-
# Permission is hereby granted, free of charge, to any person obtaining a copy
5-
# of this software and associated documentation files (the "Software"), to deal
6-
# in the Software without restriction, including without limitation the rights
7-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
# copies of the Software, and to permit persons to whom the Software is
9-
# furnished to do so, subject to the following conditions:
10-
#
11-
# The above copyright notice and this permission notice shall be included in all
12-
# copies or substantial portions of the Software.
13-
#
14-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
# SOFTWARE.
21-
#
1+
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:debianslim
222

23-
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine-jre
3+
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
244

25-
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
26-
27-
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
28-
LABEL org.opencontainers.image.licenses=MIT
29-
30-
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \
31-
&& adduser -D -h /home/container container
5+
RUN apt-get update -y \
6+
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
7+
&& useradd -d /home/container -m container
328

339
USER container
3410
ENV USER=container HOME=/home/container
11+
3512
WORKDIR /home/container
3613

37-
COPY ./../entrypoint.sh /entrypoint.sh
38-
CMD [ "/bin/ash", "/entrypoint.sh" ]
14+
COPY ./entrypoint.sh /entrypoint.sh
15+
16+
CMD ["/bin/bash", "/entrypoint.sh"]

‎java/16/Dockerfile‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
1-
#
2-
# Copyright (c) 2021 Matthew Penner
3-
#
4-
# Permission is hereby granted, free of charge, to any person obtaining a copy
5-
# of this software and associated documentation files (the "Software"), to deal
6-
# in the Software without restriction, including without limitation the rights
7-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
# copies of the Software, and to permit persons to whom the Software is
9-
# furnished to do so, subject to the following conditions:
10-
#
11-
# The above copyright notice and this permission notice shall be included in all
12-
# copies or substantial portions of the Software.
13-
#
14-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
# SOFTWARE.
21-
#
1+
FROM --platform=$BUILDPLATFORM openjdk:16-slim
222

23-
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16:alpine-jre
24-
25-
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
3+
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
264

275
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
286
LABEL org.opencontainers.image.licenses=MIT
297

30-
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \
31-
&& adduser -D -h /home/container container
8+
RUN apt-get update -y \
9+
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
10+
&& useradd -d /home/container -m container
3211

3312
USER container
3413
ENV USER=container HOME=/home/container
3514
WORKDIR /home/container
3615

3716
COPY ./../entrypoint.sh /entrypoint.sh
38-
CMD [ "/bin/ash", "/entrypoint.sh" ]
17+
CMD [ "/bin/bash", "/entrypoint.sh" ]

‎java/16j9/Dockerfile‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,16 @@
1-
#
2-
# Copyright (c) 2021 Matthew Penner
3-
#
4-
# Permission is hereby granted, free of charge, to any person obtaining a copy
5-
# of this software and associated documentation files (the "Software"), to deal
6-
# in the Software without restriction, including without limitation the rights
7-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
# copies of the Software, and to permit persons to whom the Software is
9-
# furnished to do so, subject to the following conditions:
10-
#
11-
# The above copyright notice and this permission notice shall be included in all
12-
# copies or substantial portions of the Software.
13-
#
14-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
# SOFTWARE.
21-
#
1+
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:debianslim
222

23-
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:alpine-jre
3+
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
244

25-
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
26-
27-
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
28-
LABEL org.opencontainers.image.licenses=MIT
29-
30-
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \
31-
&& adduser -D -h /home/container container
5+
RUN apt-get update -y \
6+
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
7+
&& useradd -d /home/container -m container
328

339
USER container
3410
ENV USER=container HOME=/home/container
11+
3512
WORKDIR /home/container
3613

37-
COPY ./../entrypoint.sh /entrypoint.sh
38-
CMD [ "/bin/ash", "/entrypoint.sh" ]
14+
COPY ./entrypoint.sh /entrypoint.sh
15+
16+
CMD ["/bin/bash", "/entrypoint.sh"]

‎java/8/Dockerfile‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
1-
#
2-
# Copyright (c) 2021 Matthew Penner
3-
#
4-
# Permission is hereby granted, free of charge, to any person obtaining a copy
5-
# of this software and associated documentation files (the "Software"), to deal
6-
# in the Software without restriction, including without limitation the rights
7-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
# copies of the Software, and to permit persons to whom the Software is
9-
# furnished to do so, subject to the following conditions:
10-
#
11-
# The above copyright notice and this permission notice shall be included in all
12-
# copies or substantial portions of the Software.
13-
#
14-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
# SOFTWARE.
21-
#
1+
FROM --platform=$BUILDPLATFORM openjdk:8-slim-buster
222

23-
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8:alpine-jre
24-
25-
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
3+
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
264

275
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
286
LABEL org.opencontainers.image.licenses=MIT
297

30-
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \
31-
&& adduser -D -h /home/container container
8+
RUN apt-get update -y \
9+
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
10+
&& useradd -d /home/container -m container
3211

3312
USER container
3413
ENV USER=container HOME=/home/container
3514
WORKDIR /home/container
3615

3716
COPY ./../entrypoint.sh /entrypoint.sh
38-
CMD [ "/bin/ash", "/entrypoint.sh" ]
17+
CMD [ "/bin/bash", "/entrypoint.sh" ]

‎java/8j9/Dockerfile‎

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,16 @@
1-
#
2-
# Copyright (c) 2021 Matthew Penner
3-
#
4-
# Permission is hereby granted, free of charge, to any person obtaining a copy
5-
# of this software and associated documentation files (the "Software"), to deal
6-
# in the Software without restriction, including without limitation the rights
7-
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8-
# copies of the Software, and to permit persons to whom the Software is
9-
# furnished to do so, subject to the following conditions:
10-
#
11-
# The above copyright notice and this permission notice shall be included in all
12-
# copies or substantial portions of the Software.
13-
#
14-
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15-
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16-
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17-
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18-
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19-
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20-
# SOFTWARE.
21-
#
1+
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:debianslim
222

23-
FROM --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:alpine-jre
3+
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
244

25-
LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
26-
27-
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
28-
LABEL org.opencontainers.image.licenses=MIT
29-
30-
RUN apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \
31-
&& adduser -D -h /home/container container
5+
RUN apt-get update -y \
6+
&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 \
7+
&& useradd -d /home/container -m container
328

339
USER container
3410
ENV USER=container HOME=/home/container
11+
3512
WORKDIR /home/container
3613

37-
COPY ./../entrypoint.sh /entrypoint.sh
38-
CMD [ "/bin/ash", "/entrypoint.sh" ]
14+
COPY ./entrypoint.sh /entrypoint.sh
15+
16+
CMD ["/bin/bash", "/entrypoint.sh"]

‎java/entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/ash
1+
#!/bin/bash
22

33
#
44
# Copyright (c) 2021 Matthew Penner
@@ -20,7 +20,7 @@
2020
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
# SOFTWARE.
23-
#
23+
#
2424

2525
# Default the TZ environment variable to UTC.
2626
TZ=${TZ:-UTC}

0 commit comments

Comments
 (0)