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

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