From 56d58226529d103902f60c1f47656290a9f4bd1f Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sun, 12 Feb 2023 09:47:06 +0100 Subject: [PATCH] feat(java): Replace openjdk with termium images (#116) --- java/11/Dockerfile | 4 ++-- java/11j9/Dockerfile | 4 ++-- java/16/Dockerfile | 4 ++-- java/16j9/Dockerfile | 4 ++-- java/17/Dockerfile | 4 ++-- java/19/Dockerfile | 4 ++-- java/8/Dockerfile | 4 ++-- java/8j9/Dockerfile | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/java/11/Dockerfile b/java/11/Dockerfile index deeca3d..007fca2 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH openjdk:11-slim +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:11.0.13_8-jdk-focal LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile index e7ec1e9..7c5c675 100644 --- a/java/11j9/Dockerfile +++ b/java/11j9/Dockerfile @@ -1,9 +1,9 @@ -FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk11-openj9:debianslim +FROM --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-11-jdk LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container diff --git a/java/16/Dockerfile b/java/16/Dockerfile index e1afe37..2080cf1 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH openjdk:16-slim +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:16-jdk-focal LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile index 306ca7c..9ee4c7d 100644 --- a/java/16j9/Dockerfile +++ b/java/16j9/Dockerfile @@ -1,9 +1,9 @@ -FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk16-openj9:debianslim +FROM --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-16-jdk LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container diff --git a/java/17/Dockerfile b/java/17/Dockerfile index 2fa7efa..3b8380b 100644 --- a/java/17/Dockerfile +++ b/java/17/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH openjdk:17-slim +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:17-jdk-focal LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container diff --git a/java/19/Dockerfile b/java/19/Dockerfile index e962f88..c565080 100644 --- a/java/19/Dockerfile +++ b/java/19/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH openjdk:19-slim +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:19-jdk-focal LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 7bd75a1..74c4b6f 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH openjdk:8-slim-buster +FROM --platform=$TARGETOS/$TARGETARCH eclipse-temurin:8u312-b07-jdk-focal LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile index 590623f..9395fe8 100644 --- a/java/8j9/Dockerfile +++ b/java/8j9/Dockerfile @@ -1,9 +1,9 @@ -FROM --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk8-openj9:debianslim +FROM --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-8-jdk LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" RUN apt update -y \ - && apt install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libfreetype6 \ + && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \ && useradd -d /home/container -m container USER container