fix dockerfiles

mcjars · Jul 29, 2024 · 420fe5b · 420fe5b
1 parent 412fc85
commit 420fe5b
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 58 deletions.
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
@@ -5,17 +5,19 @@ LABEL       author="Robert Jansen" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/mcjars/pterodactyl-yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN rm -rf /usr/bin/dd \
-			&& rm -rf /usr/bin/fallocate \
-			&& rm -rf /usr/bin/truncate \
-			&& rm -rf /usr/bin/xfs_mkfile
+RUN         rm -rf /usr/bin/dd \
+						&& rm -rf /usr/bin/fallocate \
+						&& rm -rf /usr/bin/truncate \
+						&& rm -rf /usr/bin/xfs_mkfile
 
-RUN curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
-			-o /MCAntiMalware.jar
+RUN         apt-get update -y \
+						&& apt-get install -y curl
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
- 			&& useradd -d /home/container -m container
+RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
+						-o /MCAntiMalware.jar
+
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/16/Dockerfile b/java/16/Dockerfile
@@ -5,17 +5,19 @@ LABEL       author="Robert Jansen" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/mcjars/pterodactyl-yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN rm -rf /usr/bin/dd \
-			&& rm -rf /usr/bin/fallocate \
-			&& rm -rf /usr/bin/truncate \
-			&& rm -rf /usr/bin/xfs_mkfile
+RUN         rm -rf /usr/bin/dd \
+						&& rm -rf /usr/bin/fallocate \
+						&& rm -rf /usr/bin/truncate \
+						&& rm -rf /usr/bin/xfs_mkfile
 
-RUN curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
-			-o /MCAntiMalware.jar
+RUN         apt-get update -y \
+						&& apt-get install -y curl
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
- 			&& useradd -d /home/container -m container
+RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
+						-o /MCAntiMalware.jar
+
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/17/Dockerfile b/java/17/Dockerfile
@@ -5,17 +5,19 @@ LABEL       author="Robert Jansen" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/mcjars/pterodactyl-yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN rm -rf /usr/bin/dd \
-			&& rm -rf /usr/bin/fallocate \
-			&& rm -rf /usr/bin/truncate \
-			&& rm -rf /usr/bin/xfs_mkfile
+RUN         rm -rf /usr/bin/dd \
+						&& rm -rf /usr/bin/fallocate \
+						&& rm -rf /usr/bin/truncate \
+						&& rm -rf /usr/bin/xfs_mkfile
 
-RUN curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
-			-o /MCAntiMalware.jar
+RUN         apt-get update -y \
+						&& apt-get install -y curl
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
- 			&& useradd -d /home/container -m container
+RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
+						-o /MCAntiMalware.jar
+
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/18/Dockerfile b/java/18/Dockerfile
@@ -5,17 +5,19 @@ LABEL       author="Robert Jansen" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/mcjars/pterodactyl-yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN rm -rf /usr/bin/dd \
-			&& rm -rf /usr/bin/fallocate \
-			&& rm -rf /usr/bin/truncate \
-			&& rm -rf /usr/bin/xfs_mkfile
+RUN         rm -rf /usr/bin/dd \
+						&& rm -rf /usr/bin/fallocate \
+						&& rm -rf /usr/bin/truncate \
+						&& rm -rf /usr/bin/xfs_mkfile
 
-RUN curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
-			-o /MCAntiMalware.jar
+RUN         apt-get update -y \
+						&& apt-get install -y curl
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
- 			&& useradd -d /home/container -m container
+RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
+						-o /MCAntiMalware.jar
+
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/19/Dockerfile b/java/19/Dockerfile
@@ -5,17 +5,19 @@ LABEL       author="Robert Jansen" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/mcjars/pterodactyl-yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN rm -rf /usr/bin/dd \
-			&& rm -rf /usr/bin/fallocate \
-			&& rm -rf /usr/bin/truncate \
-			&& rm -rf /usr/bin/xfs_mkfile
+RUN         rm -rf /usr/bin/dd \
+						&& rm -rf /usr/bin/fallocate \
+						&& rm -rf /usr/bin/truncate \
+						&& rm -rf /usr/bin/xfs_mkfile
 
-RUN curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
-			-o /MCAntiMalware.jar
+RUN         apt-get update -y \
+						&& apt-get install -y curl
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
- 			&& useradd -d /home/container -m container
+RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
+						-o /MCAntiMalware.jar
+
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container

diff --git a/java/21/Dockerfile b/java/21/Dockerfile
@@ -10,11 +10,13 @@ RUN         rm -rf /usr/bin/dd \
 						&& rm -rf /usr/bin/truncate \
 						&& rm -rf /usr/bin/xfs_mkfile
 
+RUN         apt-get update -y \
+						&& apt-get install -y curl
+
 RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
 						-o /MCAntiMalware.jar
 
-RUN 				apt-get update -y \
-						&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
 						&& useradd -d /home/container -m container
 
 USER        container

diff --git a/java/22/Dockerfile b/java/22/Dockerfile
@@ -10,11 +10,13 @@ RUN         rm -rf /usr/bin/dd \
 						&& rm -rf /usr/bin/truncate \
 						&& rm -rf /usr/bin/xfs_mkfile
 
+RUN         apt-get update -y \
+						&& apt-get install -y curl
+
 RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
 						-o /MCAntiMalware.jar
 
-RUN 				apt-get update -y \
-						&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
 						&& useradd -d /home/container -m container
 
 USER        container

diff --git a/java/8/Dockerfile b/java/8/Dockerfile
@@ -5,17 +5,19 @@ LABEL       author="Robert Jansen" maintainer="[email protected]"
 LABEL       org.opencontainers.image.source="https://github.com/mcjars/pterodactyl-yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN rm -rf /usr/bin/dd \
-			&& rm -rf /usr/bin/fallocate \
-			&& rm -rf /usr/bin/truncate \
-			&& rm -rf /usr/bin/xfs_mkfile
+RUN         rm -rf /usr/bin/dd \
+						&& rm -rf /usr/bin/fallocate \
+						&& rm -rf /usr/bin/truncate \
+						&& rm -rf /usr/bin/xfs_mkfile
 
-RUN curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
-			-o /MCAntiMalware.jar
+RUN         apt-get update -y \
+						&& apt-get install -y curl
 
-RUN 		apt-get update -y \
- 			&& apt-get install -y jq lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
- 			&& useradd -d /home/container -m container
+RUN         curl -sSL https://github.com/OpticFusion1/MCAntiMalware/releases/latest/download/MCAntiMalware.jar \
+						-o /MCAntiMalware.jar
+
+RUN 				apt-get install -y jq lsof ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 tzdata iproute2 libstdc++6 \
+						&& useradd -d /home/container -m container
 
 USER        container
 ENV         USER=container HOME=/home/container