Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity

Potential fix for pull request finding

Browse Source 
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Jeshua Ben Joseph
2026-05-18 13:57:19 -07:00
committed by GitHub
co-authored by Copilot Autofix powered by AI
parent 1a930ec955
commit 1fb3ce0c68
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/prepare.sh
+15
View File
@@ -63,18 +63,33 @@ if grep -E '^ID=' /etc/os-release | grep -q ubuntu; then
if dpkg --compare-versions "$UBUNTU_VERSION" ge "26.04" 2>/dev/null; then if dpkg --compare-versions "$UBUNTU_VERSION" ge "26.04" 2>/dev/null; then
if [ "${INSTALL_GNU_COREUTILS:-0}" -eq 1 ]; then if [ "${INSTALL_GNU_COREUTILS:-0}" -eq 1 ]; then
echo "*** Installing GNU Coreutils and traditional sudo to replace Rust variants..." echo "*** Installing GNU Coreutils and traditional sudo to replace Rust variants..."
GNU_COREUTILS_INSTALLED=0
TRADITIONAL_SUDO_INSTALLED=0
# Install GNU Coreutils if available (package name may vary by Ubuntu release). # Install GNU Coreutils if available (package name may vary by Ubuntu release).
# 'coreutils-gnu' is the expected package name for the GNU implementation # 'coreutils-gnu' is the expected package name for the GNU implementation
# when uutils-coreutils is the default. # when uutils-coreutils is the default.
if apt-cache show coreutils-gnu > /dev/null 2>&1; then if apt-cache show coreutils-gnu > /dev/null 2>&1; then
$minimal_apt_get_install coreutils-gnu $minimal_apt_get_install coreutils-gnu
GNU_COREUTILS_INSTALLED=1
fi fi
# Install traditional sudo if available (package name may vary). # Install traditional sudo if available (package name may vary).
# 'sudo-traditional' or similar may be provided alongside 'sudo-rs'. # 'sudo-traditional' or similar may be provided alongside 'sudo-rs'.
if apt-cache show sudo-traditional > /dev/null 2>&1; then if apt-cache show sudo-traditional > /dev/null 2>&1; then
$minimal_apt_get_install sudo-traditional $minimal_apt_get_install sudo-traditional
TRADITIONAL_SUDO_INSTALLED=1
elif apt-cache show sudo-classic > /dev/null 2>&1; then elif apt-cache show sudo-classic > /dev/null 2>&1; then
$minimal_apt_get_install sudo-classic $minimal_apt_get_install sudo-classic
TRADITIONAL_SUDO_INSTALLED=1
fi
if [ "$GNU_COREUTILS_INSTALLED" -ne 1 ] || [ "$TRADITIONAL_SUDO_INSTALLED" -ne 1 ]; then
echo "*** ERROR: INSTALL_GNU_COREUTILS=1 was requested, but the requested replacements could not be fully installed." >&2
if [ "$GNU_COREUTILS_INSTALLED" -ne 1 ]; then
echo "*** ERROR: No GNU coreutils replacement package was found (tried: coreutils-gnu)." >&2
fi
if [ "$TRADITIONAL_SUDO_INSTALLED" -ne 1 ]; then
echo "*** ERROR: No traditional sudo replacement package was found (tried: sudo-traditional, sudo-classic)." >&2
fi
exit 1
fi fi
else else
echo "*** Ubuntu 26.04 detected: using default uutils-coreutils (Rust) and sudo-rs (Rust)." echo "*** Ubuntu 26.04 detected: using default uutils-coreutils (Rust) and sudo-rs (Rust)."