Move to Debian 12 and fix Uptime Kuma

This commit is contained in:
Quinten
2024-04-02 15:50:15 +02:00
committed by GitHub
parent e702e788be
commit b3f8b0844a
34 changed files with 56 additions and 53 deletions

View File

@@ -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

View File

@@ -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}"

View File

@@ -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

View File

@@ -1,4 +1,4 @@
FROM --platform=$TARGETOS/$TARGETARCH debian:bullseye
FROM --platform=$TARGETOS/$TARGETARCH debian:bookworm
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"

View File

@@ -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

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -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

View File

@@ -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 \

View File

@@ -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

View File

@@ -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

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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 \

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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

View File

@@ -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 \

View File

@@ -1,7 +1,7 @@
# ---------------------------------------------
# Steam Proton image
# ---------------------------------------------
FROM debian:bullseye-slim
FROM debian:bookworm-slim
LABEL author="Torsten Widmann" maintainer="info@goover.de"

View File

@@ -1,7 +1,7 @@
# ---------------------------------------------
# Steam Proton image
# ---------------------------------------------
FROM debian:bullseye-slim
FROM debian:bookworm-slim
LABEL author="Torsten Widmann" maintainer="info@goover.de"

View File

@@ -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"

View File

@@ -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

View File

@@ -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

View File

@@ -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