From 412f516b97882f83ed7b93b84ca73f9b1eaf66e2 Mon Sep 17 00:00:00 2001 From: Nicolas Simon Date: Tue, 26 Nov 2024 01:14:32 +0100 Subject: [PATCH] add argon2 support + reduce image size --- java/11/Dockerfile | 4 +++- java/11j9/Dockerfile | 4 +++- java/16/Dockerfile | 4 +++- java/16j9/Dockerfile | 4 +++- java/17/Dockerfile | 4 +++- java/17j9/Dockerfile | 4 +++- java/18/Dockerfile | 4 +++- java/18j9/Dockerfile | 4 +++- java/19/Dockerfile | 4 +++- java/19j9/Dockerfile | 4 +++- java/21/Dockerfile | 4 +++- java/8/Dockerfile | 4 +++- java/8j9/Dockerfile | 4 +++- 13 files changed, 39 insertions(+), 13 deletions(-) diff --git a/java/11/Dockerfile b/java/11/Dockerfile index 9efc5ba98..10b18abc4 100644 --- a/java/11/Dockerfile +++ b/java/11/Dockerfile @@ -36,7 +36,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile index 4454341bf..1479d188d 100644 --- a/java/11j9/Dockerfile +++ b/java/11j9/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/16/Dockerfile b/java/16/Dockerfile index 1c904bdc3..c25eccda5 100644 --- a/java/16/Dockerfile +++ b/java/16/Dockerfile @@ -29,7 +29,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile index 0f5632e8f..e68a31b77 100644 --- a/java/16j9/Dockerfile +++ b/java/16j9/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/17/Dockerfile b/java/17/Dockerfile index a55fe0fed..b3f2e1c35 100644 --- a/java/17/Dockerfile +++ b/java/17/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/17j9/Dockerfile b/java/17j9/Dockerfile index 3bec1ec03..2a26d2326 100644 --- a/java/17j9/Dockerfile +++ b/java/17j9/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/18/Dockerfile b/java/18/Dockerfile index 5698b0e2f..2638e2a20 100644 --- a/java/18/Dockerfile +++ b/java/18/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/18j9/Dockerfile b/java/18j9/Dockerfile index b83df450b..40f879d4d 100644 --- a/java/18j9/Dockerfile +++ b/java/18j9/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/19/Dockerfile b/java/19/Dockerfile index f4e2f1e25..184f85e16 100644 --- a/java/19/Dockerfile +++ b/java/19/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ + && rm -rf /var/lib/apt/lists/* \ && useradd -d /home/container -m container USER container diff --git a/java/19j9/Dockerfile b/java/19j9/Dockerfile index 8f818c57d..1928695b3 100644 --- a/java/19j9/Dockerfile +++ b/java/19j9/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/21/Dockerfile b/java/21/Dockerfile index 6dba24aea..6257db746 100644 --- a/java/21/Dockerfile +++ b/java/21/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 2aee00a5f..f708e74ac 100644 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -36,7 +36,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile index 77d534884..cf473a084 100644 --- a/java/8j9/Dockerfile +++ b/java/8j9/Dockerfile @@ -28,7 +28,9 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk LABEL org.opencontainers.image.licenses=MIT RUN apt-get update -y \ - && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \ + && apt-get install -y lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 libargon2-dev \ + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/$(arch)-linux-gnu/libargon2.so /usr/lib/libargon2.so \ && useradd -d /home/container -m container USER container