Ubuntu focal(20.04) EOL changes in features test scripts

src/git/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "git",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "name": "Git (from source)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
     "description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",

src/git/install.sh

@@ -270,6 +270,12 @@ elif [ "${ADJUSTED_ID}" = "rhel" ]; then
     if ! type curl > /dev/null 2>&1; then
         check_packages curl
     fi
+    if ! type cmp > /dev/null 2>&1; then
+        check_packages diffutils
+    fi
+    if ! type awk > /dev/null 2>&1; then
+        check_packages gawk
+    fi        
     if [ $ID = "mariner" ]; then
         check_packages glibc-devel kernel-headers binutils
     fi

test/_global/scenarios.json

@@ -1,14 +1,14 @@
 {
     "all_the_clis": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "aws-cli": {},
             "azure-cli": {},
             "github-cli": {}
         }
     },
     "node_java_rust": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "node": {},
             "java": {},

test/common-utils/devcontainer-custom-home/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 RUN groupadd customUser -g 30000 && \
     useradd customUser -u 30000 -g 30000 --create-home --home-dir /customHome

test/common-utils/devcontainer-info/Dockerfile

@@ -1,3 +1,9 @@
-FROM ubuntu:focal
+FROM ubuntu:noble
 
 COPY meta.env /usr/local/etc/dev-containers/meta.env
+
+RUN if id "ubuntu" &>/dev/null; then \
+            echo "Deleting user 'ubuntu' for noble" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for noble"; \  
+        else \
+            echo "User 'ubuntu' does not exist for noble"; \ 
+    fi

test/common-utils/noble.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${VERSION_CODENAME}" = "noble"
+
+# Report result
+reportResults
+

test/common-utils/scenarios.json

@@ -1,25 +1,18 @@
 {
-    "bionic": {
-        "image": "ubuntu:bionic",
-        "remoteUser": "devcontainer",
-        "features": {
-            "common-utils": {}
-        }
-    },
-    "focal": {
-        "image": "ubuntu:focal",
+    "jammy": {
+        "image": "ubuntu:jammy",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
     },
-    "jammy": {
-        "image": "ubuntu:jammy",
+    "noble": {
+        "image": "ubuntu:noble",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
-    },
+    },    
     "buster": {
         "image": "debian:buster",
         "remoteUser": "devcontainer",

test/conda/scenarios.json

@@ -1,6 +1,6 @@
 {
     "install_conda": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "conda": {
                 "version": "4.12.0",

test/docker-in-docker/docker_specific_moby_buildx.sh

@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 # Definition specific tests
-check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.12.0'"
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.14.0'"
 
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"

test/docker-in-docker/scenarios.json

@@ -1,6 +1,6 @@
 {
     "docker_build_fallback_compose": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "latest",
@@ -9,7 +9,7 @@
         }
     },
     "dockerIp6tablesDisabledTest": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "27.0.3",
@@ -56,7 +56,7 @@
         "remoteUser": "node"
     },
     "docker_build_2": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "latest",
@@ -106,7 +106,7 @@
         }
     },
     "docker_compose_v1": {
-        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "docker-in-docker": {
                 "moby": true,
@@ -116,7 +116,7 @@
         }
     },
     "docker_compose_v2": {
-        "image": "mcr.microsoft.com/devcontainers/base:focal",
+        "image": "mcr.microsoft.com/devcontainers/base:noble",
         "features": {
             "docker-in-docker": {
                 "moby": true,
@@ -126,7 +126,7 @@
         }
     },
     "docker_build_fallback_buildx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
                 "version": "latest",
@@ -135,10 +135,10 @@
         }
     },
     "docker_specific_moby_buildx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-in-docker": {
-                "mobyBuildxVersion": "0.12.0"
+                "mobyBuildxVersion": "0.14.0"
             }
         }
     },

test/docker-outside-of-docker/docker_specific_moby_buildx.sh

@@ -5,7 +5,7 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 # Definition specific tests
-check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.12.0'"
+check "moby-buildx" bash -c "dpkg-query -W moby-buildx  | grep -E '0.14.0'"
 
 check "docker-buildx" bash -c "docker buildx version"
 check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"

test/docker-outside-of-docker/scenarios.json

@@ -1,6 +1,6 @@
 {
     "docker_build_compose_fallback": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -10,7 +10,7 @@
         "containerUser": "vscode"
     },
     "docker_init_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true
@@ -19,7 +19,7 @@
         "containerUser": "vscode"
     },
     "docker_init": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false
@@ -46,7 +46,7 @@
         "containerUser": "vscode"
     },
     "docker_build": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -56,7 +56,7 @@
         "containerUser": "vscode"
     },
     "docker_build_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true
@@ -65,29 +65,29 @@
         "containerUser": "vscode"
     },
     "docker_build_no_buildx": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
-                "version": "20",
+                "version": "26",
                 "moby": false,
                 "installDockerBuildx": false
             }
         },
         "containerUser": "vscode"
     },
     "docker_build_no_buildx_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
-                "version": "20",
+                "version": "26",
                 "moby": true,
                 "installDockerBuildx": false
             }
         },
         "containerUser": "vscode"
     },
     "docker_dash_compose_v1": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -97,7 +97,7 @@
         "containerUser": "vscode"
     },
     "docker_dash_compose_v1_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true,
@@ -107,7 +107,7 @@
         "containerUser": "vscode"
     },
     "docker_dash_compose_v2": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": false,
@@ -117,7 +117,7 @@
         "containerUser": "vscode"
     },
     "docker_dash_compose_v2_moby": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "moby": true,
@@ -136,10 +136,10 @@
         "remoteUser": "node"
     },
     "docker_specific_moby_buildx": {
-        "image": "ubuntu:focal",
+        "image": "ubuntu:noble",
         "features": {
             "docker-outside-of-docker": {
-                "mobyBuildxVersion": "0.12.0"
+                "mobyBuildxVersion": "0.14.0"
             }
         }
     },
@@ -154,7 +154,7 @@
         }
     },
     "docker_not_install_compose_switch": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "dockerDashComposeVersion": "latest",
@@ -164,7 +164,7 @@
         "containerUser": "vscode"
     },
     "docker_install_compose_switch": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "features": {
             "docker-outside-of-docker": {
                 "dockerDashComposeVersion": "latest",

test/git/install_git_from_ppa_jammy.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
+

test/git/install_git_from_src_noble.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" git  --version
+check "gettext" dpkg-query -l gettext
+
+cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
+cd feature-starter
+check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
+
+# Report result
+reportResults
+