From 3bac8013660cc5eff0716e1a06a9cbc0a95ecd7e Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 4 May 2026 12:51:42 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Fix=20apt=20sources=20and=20add?= =?UTF-8?q?=20ca-certificates=20across=20Debian=20versions=20=F0=9F=94=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add ca-certificates to PACK_LIST in all four Dockerfiles (10-13) - Explicitly write apt sources.list for each Debian release (buster, bullseye, bookworm, trixie) with contrib and non-free components - Remove conflicting sources.list.d/*.sources files before writing new sources - Add Acquire::Check-Valid-Until false for buster archive to bypass expired release date check Dockerfile.10 Dockerfile.11 Dockerfile.12 Dockerfile.13 --- Dockerfile.10 | 9 ++++++--- Dockerfile.11 | 7 ++++++- Dockerfile.12 | 7 ++++++- Dockerfile.13 | 7 ++++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Dockerfile.10 b/Dockerfile.10 index 3a79189..6da52bf 100644 --- a/Dockerfile.10 +++ b/Dockerfile.10 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot jq " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -75,8 +75,11 @@ RUN set -e; \ echo "Setting up prerequisites"; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ - echo "deb http://archive.debian.org/debian buster main" > /etc/apt/sources.list; \ - echo "deb http://archive.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list; \ + rm -f /etc/apt/sources.list.d/*.sources 2>/dev/null || true; \ + echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99archive-release; \ + printf '%s\n' \ + "deb http://archive.debian.org/debian buster main contrib non-free" \ + "deb http://archive.debian.org/debian-security buster/updates main contrib non-free" > /etc/apt/sources.list; \ apt update && apt install -yy bash locales apt-utils; \ locale-gen $LANG && update-locale LANG=$LANG; \ update-alternatives --install /bin/sh sh /bin/bash 1 diff --git a/Dockerfile.11 b/Dockerfile.11 index a4c11ae..fc38d70 100644 --- a/Dockerfile.11 +++ b/Dockerfile.11 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot jq " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -75,6 +75,11 @@ RUN set -e; \ echo "Setting up prerequisites"; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ + rm -f /etc/apt/sources.list.d/*.sources 2>/dev/null || true; \ + printf '%s\n' \ + "deb http://deb.debian.org/debian bullseye main contrib non-free" \ + "deb http://deb.debian.org/debian bullseye-updates main contrib non-free" \ + "deb http://security.debian.org/debian-security bullseye-security main contrib non-free" > /etc/apt/sources.list; \ apt update && apt install -yy bash locales apt-utils python3-tz; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \ update-alternatives --install /bin/sh sh /bin/bash 1 diff --git a/Dockerfile.12 b/Dockerfile.12 index d4c390d..5e72598 100644 --- a/Dockerfile.12 +++ b/Dockerfile.12 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot jq " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -75,6 +75,11 @@ RUN set -e; \ echo "Setting up prerequisites"; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ + rm -f /etc/apt/sources.list.d/*.sources 2>/dev/null || true; \ + printf '%s\n' \ + "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" \ + "deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" \ + "deb http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware" > /etc/apt/sources.list; \ apt update && apt install -yy bash locales apt-utils; \ locale-gen $LANG && update-locale LANG=$LANG; \ update-alternatives --install /bin/sh sh /bin/bash 1 diff --git a/Dockerfile.13 b/Dockerfile.13 index 386342b..e52034c 100644 --- a/Dockerfile.13 +++ b/Dockerfile.13 @@ -55,7 +55,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG DEBIAN_FRONTEND -ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot jq " +ARG PACK_LIST="bash-completion git curl wget sudo unzip tini xz-utils iproute2 pinentry-curses bsd-mailx procps net-tools bsd-mailx postfix python3-icu python3-pip certbot ca-certificates jq " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -75,6 +75,11 @@ RUN set -e; \ echo "Setting up prerequisites"; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ + rm -f /etc/apt/sources.list.d/*.sources 2>/dev/null || true; \ + printf '%s\n' \ + "deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware" \ + "deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware" \ + "deb http://security.debian.org/debian-security trixie-security main contrib non-free non-free-firmware" > /etc/apt/sources.list; \ apt update && apt install -yy bash locales apt-utils; \ locale-gen $LANG && update-locale LANG=$LANG; \ update-alternatives --install /bin/sh sh /bin/bash 1