Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-09-21 08:48:10 +00:00
Code Issues Releases Wiki Activity

Add Ubuntu 26.04 "Resolute" as a supported base image track alongside the existing Noble (24.04) and Jammy (22.04) tracks.

Browse Source 
Changes:

main.yml: add resolute-* tag prefix → ubuntu:26.04 mapping
scheduled-build.yml: add Resolute matrix entry to weekly security rebuild
prepare.sh: handle DEB822 .sources format (used by Ubuntu 24.04+) alongside legacy sources.list for universe/multiverse activation
README.md: update component table to reflect multi-track support
This commit is contained in:
Houssem eXo
2026-05-18 13:44:07 -07:00
committed by Jeshua Ben Joseph
parent f5be954731
commit 8128153b6f
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/prepare.sh
+15 -3
View File
@@ -12,9 +12,21 @@ echo -n no > /etc/container_environment/INITRD
## Enable Ubuntu Universe, Multiverse, and deb-src for main.
if grep -E '^ID=' /etc/os-release | grep -q ubuntu; then
sed -i 's/^#\s*\(deb.*main restricted\)$/\1/g' /etc/apt/sources.list
sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list
UBUNTU_VERSION=$(grep '^VERSION_ID=' /etc/os-release | cut -d'"' -f2)
# Ubuntu 24.04+ uses DEB822 format (.sources files); older releases use sources.list
if dpkg --compare-versions "$UBUNTU_VERSION" ge "24.04" 2>/dev/null && \
compgen -G '/etc/apt/sources.list.d/*.sources' > /dev/null; then
# DEB822 format: enable universe and multiverse components
for f in /etc/apt/sources.list.d/*.sources; do
sed -i 's/^Components: main$/Components: main restricted universe multiverse/' "$f"
sed -i 's/^Components: main restricted$/Components: main restricted universe multiverse/' "$f"
done
else
# Legacy sources.list format (Ubuntu < 24.04)
sed -i 's/^#\s*\(deb.*main restricted\)$/\1/g' /etc/apt/sources.list
sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list
fi
fi
apt-get update