From b3f8b0844a2674d20fe7f6a1f05f9042158dab33 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:50:15 +0200 Subject: [PATCH 1/3] Move to Debian 12 and fix Uptime Kuma --- apps/uptimekuma/Dockerfile | 3 ++- apps/uptimekuma/entrypoint.sh | 2 ++ bot/bastion/Dockerfile | 12 ++++++------ bot/parkertron/Dockerfile | 2 +- bot/red/Dockerfile | 4 ++-- bot/sinusbot/Dockerfile | 4 ++-- box64/Dockerfile | 6 +++--- games/altv/Dockerfile | 8 ++++---- games/minetest/Dockerfile | 2 +- games/samp/Dockerfile | 4 ++-- games/source/Dockerfile | 4 ++-- installers/debian/Dockerfile | 2 +- installers/ubuntu/Dockerfile | 2 +- mongodb/6/Dockerfile | 2 +- nodejs/16/Dockerfile | 2 +- nodejs/18/Dockerfile | 2 +- nodejs/20/Dockerfile | 2 +- nodejs/21/Dockerfile | 2 +- oses/debian/Dockerfile | 8 ++++---- python/3.10/Dockerfile | 2 +- python/3.11/Dockerfile | 2 +- python/3.12/Dockerfile | 2 +- python/3.8/Dockerfile | 2 +- python/3.9/Dockerfile | 2 +- redis/6/Dockerfile | 2 +- redis/7/Dockerfile | 2 +- steamcmd/debian/Dockerfile | 4 ++-- steamcmd/dotnet/Dockerfile | 6 +++--- steamcmd/proton/Dockerfile | 2 +- steamcmd/proton_8/Dockerfile | 2 +- voice/teaspeak/Dockerfile | 2 +- wine/devel/Dockerfile | 2 +- wine/latest/Dockerfile | 2 +- wine/staging/Dockerfile | 2 +- 34 files changed, 56 insertions(+), 53 deletions(-) diff --git a/apps/uptimekuma/Dockerfile b/apps/uptimekuma/Dockerfile index 1f8b17bfe..f3325cf01 100644 --- a/apps/uptimekuma/Dockerfile +++ b/apps/uptimekuma/Dockerfile @@ -26,6 +26,7 @@ RUN apk add --no-cache \ python3 \ python3-dev \ py3-pip \ + pipx \ sqlite \ tzdata \ zip \ @@ -42,7 +43,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; e RUN chmod +x /usr/bin/cloudflared # install apprise -RUN pip install apprise +RUN pipx install apprise ## Setup user and working directory RUN adduser -D -h /home/container container -s /bin/bash container diff --git a/apps/uptimekuma/entrypoint.sh b/apps/uptimekuma/entrypoint.sh index e529b3a9a..7120b8e15 100644 --- a/apps/uptimekuma/entrypoint.sh +++ b/apps/uptimekuma/entrypoint.sh @@ -31,6 +31,8 @@ echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" echo -e "${YELLOW}Cloudflared Version: ${RED} $(/usr/bin/cloudflared --version) ${NC}" echo -e "${BLUE}-------------------------------------------------${NC}" +export PATH=$PATH:/root/.local/bin + # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') echo ":/home/container$ ${MODIFIED_STARTUP}" diff --git a/bot/bastion/Dockerfile b/bot/bastion/Dockerfile index ed858fa57..a3fd8a974 100644 --- a/bot/bastion/Dockerfile +++ b/bot/bastion/Dockerfile @@ -1,12 +1,12 @@ -FROM --platform=$TARGETOS/$TARGETARCH mongo:6-focal +FROM --platform=$TARGETOS/$TARGETARCH mongo:6-jammy LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" -## install nodejs 18 -RUN apt update && apt install --no-install-recommends -y curl \ - && mkdir -p /etc/apt/keyrings \ - && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ - && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ +## install nodejs 20 +RUN apt update && apt install --no-install-recommends -y curl apt-transport-https ca-certificates gnupg \ + && mkdir -p /usr/share/keyrings \ + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt update && apt install -y nodejs \ && npm install -g npm@latest \ ## install bastion reqs diff --git a/bot/parkertron/Dockerfile b/bot/parkertron/Dockerfile index 871fe67af..c1cc297ff 100644 --- a/bot/parkertron/Dockerfile +++ b/bot/parkertron/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/bot/red/Dockerfile b/bot/red/Dockerfile index 0e06a096c..8e1b83494 100644 --- a/bot/red/Dockerfile +++ b/bot/red/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH python:3.11-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.11-slim-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -34,7 +34,7 @@ RUN apt update \ liblzma-dev \ ffmpeg \ imagemagick \ - tini + tini RUN pip install --upgrade pip RUN pip install python-forecastio tweepy unidecode mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil diff --git a/bot/sinusbot/Dockerfile b/bot/sinusbot/Dockerfile index b833e6fad..76f8b640b 100644 --- a/bot/sinusbot/Dockerfile +++ b/bot/sinusbot/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL org.opencontainers.image.authors="i2007@damw.eu" LABEL version="1.0" @@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND noninteractive # Install Dependencies RUN apt update \ && apt upgrade -y \ - && apt install -y ca-certificates less locales pulseaudio python python3 python3-pip sudo x11vnc x11-xkb-utils xvfb iproute2 ffmpeg curl liblcms2-2 libatomic1 libxcb-xinerama0 \ + && apt install -y ca-certificates less locales pulseaudio python3 python3-pip sudo x11vnc x11-xkb-utils xvfb iproute2 ffmpeg curl liblcms2-2 libatomic1 libxcb-xinerama0 \ fontconfig libasound2 libegl1-mesa libglib2.0-0 libnss3 libpci3 libpulse0 libxcursor1 libxslt1.1 libx11-xcb1 libxkbcommon0 bzip2 libxss1 libxcomposite1 libevent-2.1-7 \ libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 tini \ && python3 -m pip install requests \ diff --git a/box64/Dockerfile b/box64/Dockerfile index e6f4872c9..d0ae99e79 100644 --- a/box64/Dockerfile +++ b/box64/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="QuintenQVD" maintainer="josdekurk@gmail.com" @@ -10,8 +10,8 @@ RUN apt update \ ## Install dependencies RUN apt install -y libc++-dev libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools libatomic1 libsdl1.2debian libsdl2-2.0-0 \ - libfontconfig libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \ - libz-dev rapidjson-dev tzdata libevent-dev libzip4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 build-essential cmake libgdiplus libstdc++6 + libfontconfig libicu72 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libmariadb-dev-compat libduktape207 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \ + libz3-dev rapidjson-dev tzdata libevent-dev libzip4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 build-essential cmake libgdiplus libstdc++6 ## Configure locale RUN update-locale lang=en_US.UTF-8 \ diff --git a/games/altv/Dockerfile b/games/altv/Dockerfile index cd13464c3..bd257b199 100644 --- a/games/altv/Dockerfile +++ b/games/altv/Dockerfile @@ -1,7 +1,7 @@ # ---------------------------------- # Environment: debian # ---------------------------------- -FROM --platform=$TARGETOS/$TARGETARCH node:16-bullseye +FROM --platform=$TARGETOS/$TARGETARCH node:16-bookworm LABEL author="goover" maintainer="info@goover.de" @@ -12,10 +12,10 @@ RUN useradd -m -d /home/container -s /bin/bash container RUN apt update -y \ && apt upgrade -y \ && apt install -y g++ gcc libgcc-s1 lib32gcc-s1 gdb libstdc++6 libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ - libfontconfig1 libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \ + libfontconfig1 libicu72 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape207 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \ python3 dnsutils build-essential coreutils jq pcregrep tini -RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ +RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt update -y \ && apt install -y dotnet-sdk-5.0 dotnet-sdk-6.0 dotnet-sdk-7.0 libgdiplus @@ -32,4 +32,4 @@ STOPSIGNAL SIGINT COPY --chown=container:container ./entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh ENTRYPOINT ["/usr/bin/tini", "-g", "--"] -CMD ["/entrypoint.sh"] +CMD ["/entrypoint.sh"] \ No newline at end of file diff --git a/games/minetest/Dockerfile b/games/minetest/Dockerfile index d822314ee..50ead4a02 100644 --- a/games/minetest/Dockerfile +++ b/games/minetest/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH ubuntu:20.04 +FROM --platform=$TARGETOS/$TARGETARCH ubuntu:22.04 ENV DEBIAN_FRONTEND noninteractive RUN apt update -y \ diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile index 0371afe4a..a00655712 100644 --- a/games/samp/Dockerfile +++ b/games/samp/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="QuintenQVD" maintainer="josdekurk@gmail.com" @@ -8,7 +8,7 @@ RUN dpkg --add-architecture i386 \ && apt update \ && apt upgrade -y \ && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip tini \ - && apt install -y libtbb2:i386 libtbb-dev:i386 libicu-dev:i386 \ + && apt install -y libtbb12:i386 libtbb-dev:i386 libicu-dev:i386 \ && useradd -d /home/container -m container RUN mkdir -p /run/systemd && echo 'docker' > /run/systemd/container diff --git a/games/source/Dockerfile b/games/source/Dockerfile index a67e91883..0bc719c35 100644 --- a/games/source/Dockerfile +++ b/games/source/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" @@ -32,7 +32,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \ && apt update \ && apt upgrade -y \ - && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl tini \ + && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc-11-dev libgcc-12-dev libcurl4-gnutls-dev:i386 libssl-dev:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl tini \ && useradd -m -d /home/container container ## install rcon diff --git a/installers/debian/Dockerfile b/installers/debian/Dockerfile index aafb0b693..71ab96eb7 100644 --- a/installers/debian/Dockerfile +++ b/installers/debian/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" diff --git a/installers/ubuntu/Dockerfile b/installers/ubuntu/Dockerfile index 658af3ec5..bcfa60bd4 100644 --- a/installers/ubuntu/Dockerfile +++ b/installers/ubuntu/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$TARGETOS/$TARGETARCH ubuntu:focal +FROM --platform=$TARGETOS/$TARGETARCH ubuntu:jammy LABEL author="oliver194" maintainer="100048880+oliver194@users.noreply.github.com" diff --git a/mongodb/6/Dockerfile b/mongodb/6/Dockerfile index 97cb7eb0c..0e73bbe40 100644 --- a/mongodb/6/Dockerfile +++ b/mongodb/6/Dockerfile @@ -1,7 +1,7 @@ # ---------------------------------- # Environment: MongoDB # ---------------------------------- -FROM --platform=$TARGETOS/$TARGETARCH mongo:6-focal +FROM --platform=$TARGETOS/$TARGETARCH mongo:6-jammy LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile index df7acf96b..ba417f960 100644 --- a/nodejs/16/Dockerfile +++ b/nodejs/16/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:16-bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH node:16-bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/18/Dockerfile b/nodejs/18/Dockerfile index 1877db682..6abcc86c0 100644 --- a/nodejs/18/Dockerfile +++ b/nodejs/18/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:18-bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH node:18-bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/20/Dockerfile b/nodejs/20/Dockerfile index 2c5f0f9a0..a42270fb0 100644 --- a/nodejs/20/Dockerfile +++ b/nodejs/20/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:20-bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH node:20-bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/nodejs/21/Dockerfile b/nodejs/21/Dockerfile index eaf2f4275..7de0f65b3 100644 --- a/nodejs/21/Dockerfile +++ b/nodejs/21/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH node:21-bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH node:21-bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile index f47530bf5..ec572cff4 100644 --- a/oses/debian/Dockerfile +++ b/oses/debian/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" @@ -18,9 +18,9 @@ RUN apt update \ && apt upgrade -y ## Install dependencies -RUN apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ - libfontconfig libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \ - liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev libzip4 libprotobuf23 libfluidsynth2 procps libstdc++6 tini +RUN apt install -y gcc g++ libgcc-12-dev libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \ + libfontconfig1 libicu72 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev-compat libduktape207 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \ + liblua5.3-0 libz3-dev libzadc4 rapidjson-dev tzdata libevent-dev libzip4 libprotobuf32 libfluidsynth3 procps libstdc++6 tini ## Configure locale RUN update-locale lang=en_US.UTF-8 \ diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile index ccfab6e90..d7bb60723 100644 --- a/python/3.10/Dockerfile +++ b/python/3.10/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH python:3.10-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.10-slim-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.11/Dockerfile b/python/3.11/Dockerfile index ee9cbd81c..902254cf9 100644 --- a/python/3.11/Dockerfile +++ b/python/3.11/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH python:3.11-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.11-slim-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.12/Dockerfile b/python/3.12/Dockerfile index 14b1a3fa6..3d426b908 100644 --- a/python/3.12/Dockerfile +++ b/python/3.12/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH python:3.12-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.7-slim-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.8/Dockerfile b/python/3.8/Dockerfile index 51928e396..b201ec7b4 100644 --- a/python/3.8/Dockerfile +++ b/python/3.8/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH python:3.8-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.8-slim-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/python/3.9/Dockerfile b/python/3.9/Dockerfile index f4811df1b..311a44717 100644 --- a/python/3.9/Dockerfile +++ b/python/3.9/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH python:3.9-slim +FROM --platform=$TARGETOS/$TARGETARCH python:3.9-slim-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/redis/6/Dockerfile b/redis/6/Dockerfile index 6e253e43b..0f90b6f5b 100644 --- a/redis/6/Dockerfile +++ b/redis/6/Dockerfile @@ -1,7 +1,7 @@ # ---------------------------------- # Environment: redis # ---------------------------------- -FROM --platform=$TARGETOS/$TARGETARCH redis:6-bullseye +FROM --platform=$TARGETOS/$TARGETARCH redis:6-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/redis/7/Dockerfile b/redis/7/Dockerfile index 6a95b6796..def8d7e07 100644 --- a/redis/7/Dockerfile +++ b/redis/7/Dockerfile @@ -1,7 +1,7 @@ # ---------------------------------- # Environment: redis # ---------------------------------- -FROM --platform=$TARGETOS/$TARGETARCH redis:7-bullseye +FROM --platform=$TARGETOS/$TARGETARCH redis:7-bookworm LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" diff --git a/steamcmd/debian/Dockerfile b/steamcmd/debian/Dockerfile index 0bcf8c946..046047f29 100644 --- a/steamcmd/debian/Dockerfile +++ b/steamcmd/debian/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io" @@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN dpkg --add-architecture i386 \ && apt-get update \ && apt-get upgrade -y \ - && apt-get install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libsdl2-2.0-0 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl xvfb tini \ + && apt-get install -y tar curl gcc g++ lib32gcc-s1 libgcc-12-dev libgcc-11-dev libcurl4-gnutls-dev:i386 libssl-dev:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libsdl2-2.0-0 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl xvfb tini \ && useradd -m -d /home/container container ## install rcon diff --git a/steamcmd/dotnet/Dockerfile b/steamcmd/dotnet/Dockerfile index e90ae7595..fa8525e72 100644 --- a/steamcmd/dotnet/Dockerfile +++ b/steamcmd/dotnet/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="Torsten Widmann" maintainer="info@goover.de" @@ -7,14 +7,14 @@ ENV DEBIAN_FRONTEND noninteractive RUN dpkg --add-architecture i386 \ && apt update \ && apt upgrade -y \ - && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata \ + && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl-dev:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata \ && apt install -y libstdc++6 libstdc++6:i386 libc6-amd64 libc6:i386 psmisc libgdiplus libcurl4 libfontconfig1 libpangocairo-1.0-0 libnss3 libgconf-2-4 libxi6 libxcursor1 libxss1 libxcomposite1 libasound2 libxdamage1 libxtst6 libatk1.0-0 libxrandr2 libcurl4 xvfb mesa-utils git \ && apt install -y python3 python3-dev python3-pip apt-transport-https wget iproute2 sqlite3 xvfb tini \ && useradd -d /home/container -m container RUN apt update -y \ && apt upgrade -y \ - && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ + && wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt update -y \ diff --git a/steamcmd/proton/Dockerfile b/steamcmd/proton/Dockerfile index 1c8812ae9..0f08e0c0f 100644 --- a/steamcmd/proton/Dockerfile +++ b/steamcmd/proton/Dockerfile @@ -1,7 +1,7 @@ # --------------------------------------------- # Steam Proton image # --------------------------------------------- -FROM debian:bullseye-slim +FROM debian:bookworm-slim LABEL author="Torsten Widmann" maintainer="info@goover.de" diff --git a/steamcmd/proton_8/Dockerfile b/steamcmd/proton_8/Dockerfile index 388ff951e..1eec3e210 100644 --- a/steamcmd/proton_8/Dockerfile +++ b/steamcmd/proton_8/Dockerfile @@ -1,7 +1,7 @@ # --------------------------------------------- # Steam Proton image # --------------------------------------------- -FROM debian:bullseye-slim +FROM debian:bookworm-slim LABEL author="Torsten Widmann" maintainer="info@goover.de" diff --git a/voice/teaspeak/Dockerfile b/voice/teaspeak/Dockerfile index 26a41549b..068c1ca29 100644 --- a/voice/teaspeak/Dockerfile +++ b/voice/teaspeak/Dockerfile @@ -20,7 +20,7 @@ # SOFTWARE. # -FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim +FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm-slim LABEL author="Torsten Widmann" maintainer="info@goover.de" diff --git a/wine/devel/Dockerfile b/wine/devel/Dockerfile index f31e43abd..b26253238 100644 --- a/wine/devel/Dockerfile +++ b/wine/devel/Dockerfile @@ -19,7 +19,7 @@ RUN cd /tmp/ \ # Install wine and with recommends RUN mkdir -pm755 /etc/apt/keyrings RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key -RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources +RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources RUN apt update RUN apt install --install-recommends winehq-devel cabextract wine-binfmt -y diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile index b1b0a6dd9..1dbdb6e0d 100644 --- a/wine/latest/Dockerfile +++ b/wine/latest/Dockerfile @@ -19,7 +19,7 @@ RUN cd /tmp/ \ # Install wine and with recommends RUN mkdir -pm755 /etc/apt/keyrings RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key -RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources +RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources RUN apt update RUN apt install --install-recommends winehq-stable cabextract wine-binfmt -y diff --git a/wine/staging/Dockerfile b/wine/staging/Dockerfile index 0530ac062..25d12cdbe 100644 --- a/wine/staging/Dockerfile +++ b/wine/staging/Dockerfile @@ -19,7 +19,7 @@ RUN cd /tmp/ \ # Install wine and with recommends RUN mkdir -pm755 /etc/apt/keyrings RUN wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key -RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bullseye/winehq-bullseye.sources +RUN wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/debian/dists/bookworm/winehq-bookworm.sources RUN apt update RUN apt install --install-recommends winehq-staging cabextract wine-binfmt -y From 7def6d17d91ca322793f9daa05215bde269c0e16 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:05:42 +0200 Subject: [PATCH 2/3] use mongo 7 for jammy --- bot/bastion/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/bastion/Dockerfile b/bot/bastion/Dockerfile index a3fd8a974..b1a7a6fd3 100644 --- a/bot/bastion/Dockerfile +++ b/bot/bastion/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETOS/$TARGETARCH mongo:6-jammy +FROM --platform=$TARGETOS/$TARGETARCH mongo:7-jammy LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" From 82df2cdb731e3e237e860b43b7037f3178973eab Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:06:38 +0200 Subject: [PATCH 3/3] more needed packages for Uptime Kuma --- apps/uptimekuma/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/uptimekuma/Dockerfile b/apps/uptimekuma/Dockerfile index f3325cf01..2fd2a3990 100644 --- a/apps/uptimekuma/Dockerfile +++ b/apps/uptimekuma/Dockerfile @@ -23,6 +23,9 @@ RUN apk add --no-cache \ iproute2 \ iputils-ping \ libtool \ + musl \ + musl-utils \ + musl-locales \ python3 \ python3-dev \ py3-pip \