update base images

distros/alpine/edge/Dockerfile

@@ -1,8 +1,9 @@
 FROM        --platform=$BUILDPLATFORM alpine:edge
 
-LABEL   	author="Torsten Widmann" maintainer="[email protected]"
-LABEL   	org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
-LABEL   	org.opencontainers.image.licenses=MIT
+LABEL       org.opencontainers.image.authors="Torsten Widmann - gOOvER - [email protected]"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.description="Docker image for Pelican, Jexactyl & Pterodactyl"
+LABEL       org.opencontainers.image.licenses=AGPL-3.0-or-later
 
 RUN         apk add --update --no-cache \
 				ca-certificates \
@@ -48,7 +49,7 @@ RUN         apk add --update --no-cache \
 				git-lfs --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
 				duktape --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
 				fluidsynth --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-				sdl2 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community 
+				sdl2 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
 
 ## Setup user and working directory
 RUN         adduser -D -h /home/container container -s /bin/bash container

distros/alpine/latest/Dockerfile

@@ -1,8 +1,9 @@
 FROM        --platform=$BUILDPLATFORM alpine:latest
 
-LABEL   	author="Torsten Widmann" maintainer="[email protected]"
-LABEL   	org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
-LABEL   	org.opencontainers.image.licenses=MIT
+LABEL       org.opencontainers.image.authors="Torsten Widmann - gOOvER - [email protected]"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.description="Docker image for Pelican, Jexactyl & Pterodactyl"
+LABEL       org.opencontainers.image.licenses=AGPL-3.0-or-later
 
 RUN         apk add --update --no-cache \
 				ca-certificates \
@@ -48,7 +49,7 @@ RUN         apk add --update --no-cache \
 				git-lfs --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community \
 				duktape --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community \
 				fluidsynth --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community \
-				sdl2 --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community 
+				sdl2 --repository=https://dl-cdn.alpinelinux.org/alpine/latest-stable/community
 
 ## Setup user and working directory
 RUN         adduser -D -h /home/container container -s /bin/bash container

distros/archlinux/base/Dockerfile

@@ -1,6 +1,9 @@
 FROM        --platform=$BUILDPLATFORM archlinux:latest
 
-LABEL       author="Torsten Widmann" maintainer="[email protected]"
+LABEL       org.opencontainers.image.authors="Torsten Widmann - gOOvER - [email protected]"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.description="Docker image for Pelican, Jexactyl & Pterodactyl"
+LABEL       org.opencontainers.image.licenses=AGPL-3.0-or-later
 
 RUN 		pacman -Fy --noconfirm
 RUN 		pacman -Syu --noconfirm

distros/archlinux/latest/Dockerfile

@@ -1,6 +1,9 @@
 FROM        --platform=$BUILDPLATFORM archlinux:base
 
-LABEL       author="Torsten Widmann" maintainer="[email protected]"
+LABEL       org.opencontainers.image.authors="Torsten Widmann - gOOvER - [email protected]"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.description="Docker image for Pelican, Jexactyl & Pterodactyl"
+LABEL       org.opencontainers.image.licenses=AGPL-3.0-or-later
 
 RUN 		pacman -Fy --noconfirm
 RUN 		pacman -Syu --noconfirm

distros/debian/10-buster/Dockerfile

@@ -1,17 +1,18 @@
-FROM    --platform=$TARGETOS/$TARGETARCH debian:buster-slim
+FROM    	debian:buster-slim
 
-LABEL   author="Torsten Widmann" maintainer="[email protected]"
-LABEL   org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
-LABEL   org.opencontainers.image.licenses=MIT
+LABEL       org.opencontainers.image.authors="Torsten Widmann - gOOvER - [email protected]"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.description="Docker image for Pelican, Jexactyl & Pterodactyl"
+LABEL       org.opencontainers.image.licenses=AGPL-3.0-or-later
 
-ENV     DEBIAN_FRONTEND noninteractive
+ARG 		DEBIAN_FRONTEND noninteractive
 
 ## update base packages
-RUN     apt update \
-        && apt -y upgrade
+RUN     	apt update \
+        		&& apt -y upgrade
 
 ## install dependencies
-RUN     apt install -y \
+RUN     	apt install -y \
                 apt-transport-https \
                 binutils \
                 ca-certificates \
@@ -20,13 +21,13 @@ RUN     apt install -y \
                 ffmpeg \
                 g++ \
                 gcc \
-		gdb \
+				gdb \
                 git \
                 git-lfs \
                 gnupg2 \
                 icu-devtools \
                 iproute2 \
-		locales \
+				locales \
                 net-tools \
                 netcat \
                 rapidjson-dev \
@@ -58,8 +59,8 @@ RUN     apt install -y \
                 libz-dev
 
 ## configure locale
-RUN     update-locale lang=en_US.UTF-8 \
-         && dpkg-reconfigure --frontend noninteractive locales
+RUN     	update-locale lang=en_US.UTF-8 \
+         		&& dpkg-reconfigure --frontend noninteractive locales
 
 ## Setup user and working directory
 RUN     useradd -m -d /home/container -s /bin/bash container
@@ -68,4 +69,4 @@ ENV     USER=container HOME=/home/container
 WORKDIR /home/container
 
 COPY    ./../entrypoint.sh /entrypoint.sh
-CMD     ["/bin/bash", "/entrypoint.sh"]
+CMD     ["/bin/bash", "/entrypoint.sh"]

distros/debian/11-bullseye/Dockerfile

@@ -1,72 +1,73 @@
-FROM    --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
+FROM    	debian:bullseye-slim
 
-LABEL   author="Torsten Widmann" maintainer="[email protected]"
-LABEL   org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
-LABEL   org.opencontainers.image.licenses=MIT
+LABEL       org.opencontainers.image.authors="Torsten Widmann - gOOvER - [email protected]"
+LABEL       org.opencontainers.image.source="https://github.com/gOOvER/own-pterodactyl-images"
+LABEL       org.opencontainers.image.description="Docker image for Pelican, Jexactyl & Pterodactyl"
+LABEL       org.opencontainers.image.licenses=AGPL-3.0-or-later
 
-ENV     DEBIAN_FRONTEND noninteractive
+ENV    		DEBIAN_FRONTEND noninteractive
 
 ## update base packages
-RUN     apt update \
-        && apt -y upgrade
+RUN     	apt update \
+        	&& apt -y upgrade
 
 ## Install dependencies
-RUN     apt install -y \
-            apt-transport-https \
-            binutils \
-            ca-certificates \
-            cabextract \
-            curl \
-            ffmpeg \
-            g++ \
-            gcc \
-            gdb \
-            git \
-            git-lfs \
-            gnupg2 \
-            icu-devtools \
-            iproute2 \
-			locales \
-            net-tools \
-            netcat-openbsd \
-            rapidjson-dev \
-            software-properties-common \
-            sqlite3 \
-            tar \
-            telnet libatomic1 \
-            tzdata \
-            unzip \
-            wget \
-            xz-utils \
-            zip \
-            libc++-dev \
-            libc6 \
-            libduktape205 \
-            libfluidsynth2 \
-            libfontconfig \
-            libgcc1 \
-            libicu67 \
-            liblua5.4-0 \
-            liblzo2-2 \
-            libmariadbclient-dev-compat \
-            libprotobuf23 \
-            libsdl1.2debian \
-            libsdl2-2.0-0 \
-            libsqlite3-dev \
-            libssl-dev \
-            libstdc++6 \
-            libunwind8 \
-            libz-dev
+RUN     	apt install -y \
+            	apt-transport-https \
+            	binutils \
+            	ca-certificates \
+            	cabextract \
+            	curl \
+            	ffmpeg \
+            	g++ \
+            	gcc \
+            	gdb \
+            	git \
+            	git-lfs \
+            	gnupg2 \
+            	icu-devtools \
+            	iproute2 \
+				locales \
+            	net-tools \
+            	netcat-openbsd \
+            	rapidjson-dev \
+            	software-properties-common \
+            	sqlite3 \
+            	tar \
+            	telnet libatomic1 \
+            	tzdata \
+            	unzip \
+            	wget \
+            	xz-utils \
+            	zip \
+            	libc++-dev \
+            	libc6 \
+            	libduktape205 \
+            	libfluidsynth2 \
+            	libfontconfig \
+            	libgcc1 \
+            	libicu67 \
+            	liblua5.4-0 \
+            	liblzo2-2 \
+            	libmariadbclient-dev-compat \
+            	libprotobuf23 \
+            	libsdl1.2debian \
+            	libsdl2-2.0-0 \
+            	libsqlite3-dev \
+            	libssl-dev \
+            	libstdc++6 \
+            	libunwind8 \
+            	libz-dev
 
 ## configure locale
-RUN     update-locale lang=en_US.UTF-8 \
-         && dpkg-reconfigure --frontend noninteractive locales
+RUN     	update-locale lang=en_US.UTF-8 \
+         		&& dpkg-reconfigure --frontend noninteractive locales
 
 ## Setup user and working directory
-RUN     useradd -m -d /home/container -s /bin/bash container
-USER    container
-ENV     USER=container HOME=/home/container
-WORKDIR /home/container
+RUN     	useradd -m -d /home/container -s /bin/bash container
+USER    	container
+ENV     	USER=container HOME=/home/container
+WORKDIR 	/home/container
 
-COPY    ./../entrypoint.sh /entrypoint.sh
-CMD     ["/bin/bash", "/entrypoint.sh"]
+COPY    	./../entrypoint.sh /entrypoint.sh
+CMD     	["/bin/bash", "/entrypoint.sh"]