From bacfd7daa85c82df1a00b5491cf0814f39751452 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Fri, 29 May 2026 14:21:51 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20apt=20mirror=20URLs=20in?=
 =?UTF-8?q?=20EOL=20and=20bootstrap=20Dockerfiles=20=F0=9F=90=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

18.04 and 20.04 were pointing to old-releases.ubuntu.com for bionic/focal,
which returns 404s (those releases have been removed from old-releases).
24.10 arm64 was using old-releases.ports.ubuntu.com which doesn't exist —
old-releases.ubuntu.com serves all architectures.
26.04 was trying to pull casjaysdev/ubuntu:26.04 as its base, causing a
chicken-and-egg failure since that image hasn't been built yet.
- Dockerfile.18.04: switch amd64 mirror to archive.ubuntu.com/security.ubuntu.com, arm64 to ports.ubuntu.com/ubuntu-ports
- Dockerfile.20.04: same mirror fix as 18.04 for focal
- Dockerfile.24.10: unify arm64 old-releases to old-releases.ubuntu.com/ubuntu (no ports variant exists)
- Dockerfile.26.04: change PULL_URL from casjaysdev/ubuntu to ubuntu to bootstrap from official base image

Dockerfile.18.04
Dockerfile.20.04
Dockerfile.24.10
Dockerfile.26.04
---
 Dockerfile.18.04 | 2 +-
 Dockerfile.20.04 | 2 +-
 Dockerfile.24.10 | 2 +-
 Dockerfile.26.04 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.18.04 b/Dockerfile.18.04
index 4e4f324..12b50c7 100644
--- a/Dockerfile.18.04
+++ b/Dockerfile.18.04
@@ -84,7 +84,7 @@ RUN set -e; \
   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"; \
   arch="$(dpkg --print-architecture)"; \
-  case "$arch" in amd64|i386) ubuntu_mirror="http://old-releases.ubuntu.com/ubuntu"; ubuntu_security="$ubuntu_mirror" ;; *) ubuntu_mirror="http://old-releases.ports.ubuntu.com/ubuntu-ports"; ubuntu_security="$ubuntu_mirror" ;; esac; \
+  case "$arch" in amd64|i386) ubuntu_mirror="http://archive.ubuntu.com/ubuntu"; ubuntu_security="http://security.ubuntu.com/ubuntu" ;; *) ubuntu_mirror="http://ports.ubuntu.com/ubuntu-ports"; ubuntu_security="$ubuntu_mirror" ;; esac; \
   printf '%s\n' \
     "deb ${ubuntu_mirror} bionic main restricted universe multiverse" \
     "deb ${ubuntu_mirror} bionic-updates main restricted universe multiverse" \
diff --git a/Dockerfile.20.04 b/Dockerfile.20.04
index d776817..2a964e3 100644
--- a/Dockerfile.20.04
+++ b/Dockerfile.20.04
@@ -84,7 +84,7 @@ RUN set -e; \
   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"; \
   arch="$(dpkg --print-architecture)"; \
-  case "$arch" in amd64|i386) ubuntu_mirror="http://old-releases.ubuntu.com/ubuntu"; ubuntu_security="$ubuntu_mirror" ;; *) ubuntu_mirror="http://old-releases.ports.ubuntu.com/ubuntu-ports"; ubuntu_security="$ubuntu_mirror" ;; esac; \
+  case "$arch" in amd64|i386) ubuntu_mirror="http://archive.ubuntu.com/ubuntu"; ubuntu_security="http://security.ubuntu.com/ubuntu" ;; *) ubuntu_mirror="http://ports.ubuntu.com/ubuntu-ports"; ubuntu_security="$ubuntu_mirror" ;; esac; \
   printf '%s\n' \
     "deb ${ubuntu_mirror} focal main restricted universe multiverse" \
     "deb ${ubuntu_mirror} focal-updates main restricted universe multiverse" \
diff --git a/Dockerfile.24.10 b/Dockerfile.24.10
index cdcce6f..2108e82 100644
--- a/Dockerfile.24.10
+++ b/Dockerfile.24.10
@@ -80,7 +80,7 @@ RUN set -e; \
   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"; \
   arch="$(dpkg --print-architecture)"; \
-  case "$arch" in amd64|i386) ubuntu_mirror="http://old-releases.ubuntu.com/ubuntu"; ubuntu_security="$ubuntu_mirror" ;; *) ubuntu_mirror="http://old-releases.ports.ubuntu.com/ubuntu-ports"; ubuntu_security="$ubuntu_mirror" ;; esac; \
+  case "$arch" in amd64|i386) ubuntu_mirror="http://old-releases.ubuntu.com/ubuntu"; ubuntu_security="$ubuntu_mirror" ;; *) ubuntu_mirror="http://old-releases.ubuntu.com/ubuntu"; ubuntu_security="$ubuntu_mirror" ;; esac; \
   printf '%s\n' \
     "deb ${ubuntu_mirror} oracular main restricted universe multiverse" \
     "deb ${ubuntu_mirror} oracular-updates main restricted universe multiverse" \
diff --git a/Dockerfile.26.04 b/Dockerfile.26.04
index ab290f0..0ba58b4 100644
--- a/Dockerfile.26.04
+++ b/Dockerfile.26.04
@@ -26,7 +26,7 @@ ARG IMAGE_REPO="casjaysdev/ubuntu"
 ARG IMAGE_VERSION="26.04"
 ARG CONTAINER_VERSION=""
 
-ARG PULL_URL="casjaysdev/ubuntu"
+ARG PULL_URL="ubuntu"
 ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"