diff --git a/distros/alpine/edge/Dockerfile b/distros/alpine/edge/Dockerfile index 93417f2..6638df6 100644 --- a/distros/alpine/edge/Dockerfile +++ b/distros/alpine/edge/Dockerfile @@ -1,8 +1,9 @@ FROM --platform=$BUILDPLATFORM alpine:edge -LABEL author="Torsten Widmann" maintainer="info@goover.de" -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 - info@goover.de" +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 diff --git a/distros/alpine/latest/Dockerfile b/distros/alpine/latest/Dockerfile index a5dd81b..4cd6bf1 100644 --- a/distros/alpine/latest/Dockerfile +++ b/distros/alpine/latest/Dockerfile @@ -1,8 +1,9 @@ FROM --platform=$BUILDPLATFORM alpine:latest -LABEL author="Torsten Widmann" maintainer="info@goover.de" -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 - info@goover.de" +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 diff --git a/distros/archlinux/base/Dockerfile b/distros/archlinux/base/Dockerfile index e322173..8e141b9 100644 --- a/distros/archlinux/base/Dockerfile +++ b/distros/archlinux/base/Dockerfile @@ -1,6 +1,9 @@ FROM --platform=$BUILDPLATFORM archlinux:latest -LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL org.opencontainers.image.authors="Torsten Widmann - gOOvER - info@goover.de" +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 diff --git a/distros/archlinux/latest/Dockerfile b/distros/archlinux/latest/Dockerfile index 8295e73..d13ceaf 100644 --- a/distros/archlinux/latest/Dockerfile +++ b/distros/archlinux/latest/Dockerfile @@ -1,6 +1,9 @@ FROM --platform=$BUILDPLATFORM archlinux:base -LABEL author="Torsten Widmann" maintainer="info@goover.de" +LABEL org.opencontainers.image.authors="Torsten Widmann - gOOvER - info@goover.de" +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 diff --git a/distros/debian/10-buster/Dockerfile b/distros/debian/10-buster/Dockerfile index fbf9443..26b8829 100644 --- a/distros/debian/10-buster/Dockerfile +++ b/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="info@goover.de" -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 - info@goover.de" +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"] \ No newline at end of file +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/distros/debian/11-bullseye/Dockerfile b/distros/debian/11-bullseye/Dockerfile index 3fe6565..78fe79e 100644 --- a/distros/debian/11-bullseye/Dockerfile +++ b/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="info@goover.de" -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 - info@goover.de" +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"] \ No newline at end of file +COPY ./../entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/distros/debian/12-bookworm/Dockerfile b/distros/debian/12-bookworm/Dockerfile index 3557faa..191f393 100644 --- a/distros/debian/12-bookworm/Dockerfile +++ b/distros/debian/12-bookworm/Dockerfile @@ -1,76 +1,76 @@ FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim -LABEL author="Torsten Widmann" maintainer="info@goover.de" -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 - info@goover.de" +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 ARG DEBIAN_FRONTEND=noninteractive -COPY sources.list /etc/apt/sources.list ## update base packages RUN apt update \ && apt -y upgrade ## Install dependencies -RUN apt install -y \ - binutils \ - ca-certificates \ - cabextract \ - curl \ - ffmpeg \ - file \ - g++ \ - gcc \ - gdb \ - git \ - git-lfs \ - gnupg2 \ - icu-devtools \ - iproute2 \ - jq \ - locales \ - net-tools \ - netcat-openbsd \ - rapidjson-dev \ - software-properties-common \ - sqlite3 \ - tar \ - telnet \ - tzdata \ - unzip \ - wget \ - xz-utils \ - zip \ - zstd \ - libatomic1 \ - libc++-dev \ - libc6 \ - libduktape207 \ - libfluidsynth3 \ - libfontconfig \ - libgcc1 \ - libicu72 \ - liblua5.4-0 \ - liblzo2-2 \ - libmariadbclient-dev-compat \ - libprotobuf32 \ - libsdl1.2debian \ - libsdl2-2.0-0 \ - libsqlite3-dev \ - libssl-dev \ - libstdc++6 \ - libunwind8 \ - libz-dev +RUN apt install -y \ + binutils \ + ca-certificates \ + cabextract \ + curl \ + ffmpeg \ + file \ + g++ \ + gcc \ + gdb \ + git \ + git-lfs \ + gnupg2 \ + icu-devtools \ + iproute2 \ + jq \ + locales \ + net-tools \ + netcat-openbsd \ + rapidjson-dev \ + software-properties-common \ + sqlite3 \ + tar \ + telnet \ + tzdata \ + unzip \ + wget \ + xz-utils \ + zip \ + zstd \ + libatomic1 \ + libc++-dev \ + libc6 \ + libduktape207 \ + libfluidsynth3 \ + libfontconfig \ + libgcc1 \ + libicu72 \ + liblua5.4-0 \ + liblzo2-2 \ + libmariadbclient-dev-compat \ + libprotobuf32 \ + 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"] \ No newline at end of file +COPY ./../entrypoint.sh /entrypoint.sh +CMD ["/bin/bash", "/entrypoint.sh"] diff --git a/distros/debian/12-bookworm/sources.list b/distros/debian/12-bookworm/sources.list deleted file mode 100644 index 2824c78..0000000 --- a/distros/debian/12-bookworm/sources.list +++ /dev/null @@ -1,14 +0,0 @@ -deb http://deb.debian.org/debian/ bookworm contrib main non-free non-free-firmware -# deb-src http://deb.debian.org/debian/ bookworm contrib main non-free non-free-firmware - -deb http://deb.debian.org/debian/ bookworm-updates contrib main non-free non-free-firmware -# deb-src http://deb.debian.org/debian/ bookworm-updates contrib main non-free non-free-firmware - -deb http://deb.debian.org/debian/ bookworm-proposed-updates contrib main non-free non-free-firmware -# deb-src http://deb.debian.org/debian/ bookworm-proposed-updates contrib main non-free non-free-firmware - -deb http://deb.debian.org/debian/ bookworm-backports contrib main non-free non-free-firmware -# deb-src http://deb.debian.org/debian/ bookworm-backports contrib main non-free non-free-firmware - -deb http://deb.debian.org/debian-security/ bookworm-security contrib main non-free non-free-firmware -# deb-src http://deb.debian.org/debian-security/ bookworm-security contrib main non-free non-free-firmware \ No newline at end of file diff --git a/distros/ubuntu/18-bionic/Dockerfile b/distros/ubuntu/18-bionic/Dockerfile index 9c325ce..d898421 100644 --- a/distros/ubuntu/18-bionic/Dockerfile +++ b/distros/ubuntu/18-bionic/Dockerfile @@ -1,10 +1,11 @@ FROM --platform=$TARGETOS/$TARGETARCH ubuntu:18.04 -LABEL author="Torsten Widmann" maintainer="info@goover.de" -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 - info@goover.de" +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 \ @@ -12,54 +13,54 @@ RUN apt update \ ## install dependencies RUN apt install -y \ - apt-transport-https \ - binutils \ - bzip2 \ - cabextract \ - curl \ - ffmpeg \ - g++ \ - gcc \ - gdb \ - git \ - icu-devtools \ - init-system-helpers \ - iproute2 \ - locales \ - net-tools \ - netcat \ - sqlite3 \ - tar \ - telnet \ - unzip \ - wget \ - xz-utils \ - zip \ - zlib1g \ - libatomic1 \ - libc++-dev \ - libc6 \ - libcurl3-gnutls \ - libduktape202 \ - libfluidsynth1 \ - libfontconfig \ - libgcc1 \ - libicu60 \ - libiculx60 \ - libjsoncpp1 \ - libleveldb1v5 \ - liblua5.1-0 \ - libluajit-5.1-2 \ - liblzo2-2 \ - libmariadbclient-dev \ - libsdl1.2debian \ - libsdl2-2.0-0 \ - libsqlite3-0 \ - libsqlite3-dev \ - libssl1.0-dev \ - libssl1.0.0 \ - libunwind8 \ - libzip4 + apt-transport-https \ + binutils \ + bzip2 \ + cabextract \ + curl \ + ffmpeg \ + g++ \ + gcc \ + gdb \ + git \ + icu-devtools \ + init-system-helpers \ + iproute2 \ + locales \ + net-tools \ + netcat \ + sqlite3 \ + tar \ + telnet \ + unzip \ + wget \ + xz-utils \ + zip \ + zlib1g \ + libatomic1 \ + libc++-dev \ + libc6 \ + libcurl3-gnutls \ + libduktape202 \ + libfluidsynth1 \ + libfontconfig \ + libgcc1 \ + libicu60 \ + libiculx60 \ + libjsoncpp1 \ + libleveldb1v5 \ + liblua5.1-0 \ + libluajit-5.1-2 \ + liblzo2-2 \ + libmariadbclient-dev \ + libsdl1.2debian \ + libsdl2-2.0-0 \ + libsqlite3-0 \ + libsqlite3-dev \ + libssl1.0-dev \ + libssl1.0.0 \ + libunwind8 \ + libzip4 ## configure locale RUN update-locale lang=en_US.UTF-8 \ diff --git a/distros/ubuntu/20-focal/Dockerfile b/distros/ubuntu/20-focal/Dockerfile index b1ef8c6..a63b4d9 100644 --- a/distros/ubuntu/20-focal/Dockerfile +++ b/distros/ubuntu/20-focal/Dockerfile @@ -1,10 +1,11 @@ FROM --platform=$TARGETOS/$TARGETARCH ubuntu:20.04 -LABEL author="Torsten Widmann" maintainer="info@goover.de" -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 - info@goover.de" +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 \ @@ -25,7 +26,7 @@ RUN apt install -y \ icu-devtools \ init-system-helpers \ iproute2 \ - locales \ + locales \ net-tools \ netcat telnet \ sqlite3 \ diff --git a/distros/ubuntu/22-jammy/Dockerfile b/distros/ubuntu/22-jammy/Dockerfile index 89d1052..f1ef0f8 100644 --- a/distros/ubuntu/22-jammy/Dockerfile +++ b/distros/ubuntu/22-jammy/Dockerfile @@ -1,10 +1,11 @@ FROM --platform=$TARGETOS/$TARGETARCH ubuntu:22.04 -LABEL author="Torsten Widmann" maintainer="info@goover.de" -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 - info@goover.de" +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 \ diff --git a/distros/ubuntu/24-noble/Dockerfile b/distros/ubuntu/24-noble/Dockerfile index 634ab9b..c695d60 100644 --- a/distros/ubuntu/24-noble/Dockerfile +++ b/distros/ubuntu/24-noble/Dockerfile @@ -1,10 +1,11 @@ FROM --platform=$TARGETOS/$TARGETARCH ubuntu:24.04 -LABEL author="Torsten Widmann" maintainer="info@goover.de" -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 - info@goover.de" +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 \