[Ubuntu] Add Ubuntu-24.04 base image (#9754)

Co-authored-by: Alexey Ayupov <alexey-ayupov@github.com>

images/ubuntu/scripts/build/configure-apt.sh

@@ -42,6 +42,8 @@ apt-get update
 # Install jq
 apt-get install jq
 
-# Install apt-fast using quick-install.sh
-# https://github.com/ilikenwf/apt-fast
-bash -c "$(curl -fsSL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)"
+if ! is_ubuntu24; then
+    # Install apt-fast using quick-install.sh
+    # https://github.com/ilikenwf/apt-fast
+    bash -c "$(curl -fsSL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)"
+fi

images/ubuntu/scripts/build/install-container-tools.sh

@@ -11,7 +11,7 @@ source $HELPER_SCRIPTS/os.sh
 # pin podman due to https://github.com/actions/runner-images/issues/7753
 #                   https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394
 #
-if is_ubuntu20; then
+if ! is_ubuntu22; then
     install_packages=(podman buildah skopeo)
 else
     install_packages=(podman=3.4.4+ds1-1ubuntu1 buildah skopeo)
@@ -27,7 +27,7 @@ if is_ubuntu20; then
     echo "deb [arch=amd64 signed-by=$GPG_KEY] ${REPO_URL}/ /" > $REPO_PATH
 fi
 
-# Install podman, buildah, scopeo container's tools
+# Install podman, buildah, skopeo container's tools
 apt-get update
 apt-get -y install ${install_packages[@]}
 mkdir -p /etc/containers

images/ubuntu/scripts/build/install-docker.sh

@@ -48,6 +48,7 @@ done
 gid=$(cut -d ":" -f 3 /etc/group | grep "^1..$" | sort -n | tail -n 1 | awk '{ print $1+1 }')
 groupmod -g "$gid" docker
 chgrp -hR docker /run/docker.sock
+chgrp -hR docker /var/run/docker.sock
 
 # Enable docker.service
 systemctl is-active --quiet docker.service || systemctl start docker.service

images/ubuntu/scripts/build/install-gcc-compilers.sh

@@ -9,8 +9,10 @@ source $HELPER_SCRIPTS/os.sh
 source $HELPER_SCRIPTS/install.sh
 
 # Install GNU C++ compiler
-add-apt-repository ppa:ubuntu-toolchain-r/test -y
-apt-get update -y
+if ! is_ubuntu24 ; then
+    add-apt-repository ppa:ubuntu-toolchain-r/test -y
+    apt-get update -y
+fi
 
 versions=$(get_toolset_value '.gcc.versions[]')
 

images/ubuntu/scripts/build/install-gfortran.sh

@@ -9,8 +9,10 @@ source $HELPER_SCRIPTS/install.sh
 source $HELPER_SCRIPTS/os.sh
 
 # Install GNU Fortran compiler
-add-apt-repository ppa:ubuntu-toolchain-r/test -y
-apt-get update -y
+if ! is_ubuntu24 ; then
+    add-apt-repository ppa:ubuntu-toolchain-r/test -y
+    apt-get update -y
+fi
 
 versions=$(get_toolset_value '.gfortran.versions[]')
 

images/ubuntu/scripts/build/install-java-tools.sh

@@ -69,19 +69,22 @@ echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium
 # Get all the updates from enabled repositories.
 apt-get update
 
-defaultVersion=$(get_toolset_value '.java.default')
-jdkVersionsToInstall=($(get_toolset_value ".java.versions[]"))
+# While Ubuntu 24.04 binaries are not released in the Adoptium repo, we will not install Java
+if ! is_ubuntu24; then
+    defaultVersion=$(get_toolset_value '.java.default')
+    jdkVersionsToInstall=($(get_toolset_value ".java.versions[]"))
 
-for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do
-    install_open_jdk ${jdkVersionToInstall}
+    for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do
+        install_open_jdk ${jdkVersionToInstall}
 
-    if [[ ${jdkVersionToInstall} == ${defaultVersion} ]]
-    then
-        create_java_environment_variable ${jdkVersionToInstall} True
-    else
-        create_java_environment_variable ${jdkVersionToInstall} False
-    fi
-done
+        if [[ ${jdkVersionToInstall} == ${defaultVersion} ]]
+        then
+            create_java_environment_variable ${jdkVersionToInstall} True
+        else
+            create_java_environment_variable ${jdkVersionToInstall} False
+        fi
+    done
+fi
 
 # Install Ant
 apt-get install -y --no-install-recommends ant ant-optional

images/ubuntu/scripts/build/install-php.sh

@@ -73,11 +73,11 @@ for version in $php_versions; do
         # https://github.com/krakjoe/pcov#interoperability
         phpdismod -v $version pcov
 
-    if [[ $version == "7.2" || $version == "7.3" ]]; then
+    if [[ $version == "7.2" || $version == "7.3" || $version == "7.4" ]]; then
         apt-get install -y --no-install-recommends php$version-recode
     fi
 
-    if [[ $version != "8.0" && $version != "8.1" && $version != "8.2" ]]; then
+    if [[ $version != "8.0" && $version != "8.1" && $version != "8.2" && $version != "8.3" ]]; then
         apt-get install -y --no-install-recommends php$version-xmlrpc php$version-json
     fi
 done

images/ubuntu/scripts/build/install-powershell.sh

@@ -6,8 +6,16 @@
 
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/install.sh
+source $HELPER_SCRIPTS/os.sh
 
 pwsh_version=$(get_toolset_value .pwsh.version)
 
 # Install Powershell
-apt-get install -y powershell=$pwsh_version*
+if is_ubuntu24; then
+    dependency_path=$(download_with_retry "http://mirrors.kernel.org/ubuntu/pool/main/i/icu/libicu72_72.1-3ubuntu2_amd64.deb")
+    sudo dpkg -i "$dependency_path"
+    package_path=$(download_with_retry "https://github.com/PowerShell/PowerShell/releases/download/v7.4.2/powershell-lts_7.4.2-1.deb_amd64.deb")
+    sudo dpkg -i "$package_path"
+else
+    apt-get install -y powershell=$pwsh_version*
+fi

images/ubuntu/scripts/build/install-python.sh

@@ -16,9 +16,13 @@ apt-get install -y --no-install-recommends python3 python3-dev python3-pip pytho
 # Set pipx custom directory
 export PIPX_BIN_DIR=/opt/pipx_bin
 export PIPX_HOME=/opt/pipx
-python3 -m pip install pipx
-python3 -m pipx ensurepath
-
+if is_ubuntu24; then
+    apt-get install -y --no-install-recommends pipx
+    pipx ensurepath
+else
+    python3 -m pip install pipx
+    python3 -m pipx ensurepath
+fi
 # Update /etc/environment
 set_etc_environment_variable "PIPX_BIN_DIR" $PIPX_BIN_DIR
 set_etc_environment_variable "PIPX_HOME" $PIPX_HOME

images/ubuntu/scripts/build/install-rust.sh

@@ -21,7 +21,9 @@ rustup component add rustfmt clippy
 
 if is_ubuntu22; then
     cargo install bindgen-cli cbindgen cargo-audit cargo-outdated
-else
+fi
+
+if is_ubuntu20; then
     cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated
 fi
 

images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1

@@ -41,21 +41,27 @@ $languageAndRuntime.AddToolVersionsListInline("Clang", $(Get-ClangToolVersions -
 $languageAndRuntime.AddToolVersionsListInline("Clang-format", $(Get-ClangToolVersions -ToolName "clang-format"), "^\d+")
 $languageAndRuntime.AddToolVersionsListInline("Clang-tidy", $(Get-ClangTidyVersions), "^\d+")
 $languageAndRuntime.AddToolVersion("Dash", $(Get-DashVersion))
-if (Test-IsUbuntu20) {
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
     $languageAndRuntime.AddToolVersion("Erlang", $(Get-ErlangVersion))
     $languageAndRuntime.AddToolVersion("Erlang rebar3", $(Get-ErlangRebar3Version))
 }
 $languageAndRuntime.AddToolVersionsListInline("GNU C++", $(Get-CPPVersions), "^\d+")
 $languageAndRuntime.AddToolVersionsListInline("GNU Fortran", $(Get-FortranVersions), "^\d+")
 $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion))
-$languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion))
-$languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion))
-$languageAndRuntime.AddToolVersion("MSBuild", $(Get-MsbuildVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion))
+}
+if (-not $(Test-IsUbuntu24)) {
+    $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion))
+    $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MsbuildVersion))
+}
 $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion))
 $languageAndRuntime.AddToolVersion("Perl", $(Get-PerlVersion))
 $languageAndRuntime.AddToolVersion("Python", $(Get-PythonVersion))
 $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion))
-$languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $languageAndRuntime.AddToolVersion("Swift", $(Get-SwiftVersion))
+}
 
 # Package Management
 $packageManagement = $installedSoftware.AddHeader("Package Management")
@@ -64,7 +70,9 @@ $packageManagement.AddToolVersion("Helm", $(Get-HelmVersion))
 $packageManagement.AddToolVersion("Homebrew", $(Get-HomebrewVersion))
 $packageManagement.AddToolVersion("Miniconda", $(Get-MinicondaVersion))
 $packageManagement.AddToolVersion("Npm", $(Get-NpmVersion))
-$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion))
+if (-not $(Test-IsUbuntu24)) {
+    $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion))
+}
 $packageManagement.AddToolVersion("Pip", $(Get-PipVersion))
 $packageManagement.AddToolVersion("Pip3", $(Get-Pip3Version))
 $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion))
@@ -81,15 +89,11 @@ to accomplish this.
 
 # Project Management
 $projectManagement = $installedSoftware.AddHeader("Project Management")
-if (Test-IsUbuntu20) {
-    $projectManagement.AddToolVersion("Ant", $(Get-AntVersion))
-    $projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion))
-}
-if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
-    $projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion))
-}
+$projectManagement.AddToolVersion("Ant", $(Get-AntVersion))
+$projectManagement.AddToolVersion("Gradle", $(Get-GradleVersion))
+$projectManagement.AddToolVersion("Lerna", $(Get-LernaVersion))
 $projectManagement.AddToolVersion("Maven", $(Get-MavenVersion))
-if (Test-IsUbuntu20) {
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
     $projectManagement.AddToolVersion("Sbt", $(Get-SbtVersion))
 }
 
@@ -98,14 +102,20 @@ $tools = $installedSoftware.AddHeader("Tools")
 $tools.AddToolVersion("Ansible", $(Get-AnsibleVersion))
 $tools.AddToolVersion("apt-fast", $(Get-AptFastVersion))
 $tools.AddToolVersion("AzCopy", $(Get-AzCopyVersion))
-$tools.AddToolVersion("Bazel", $(Get-BazelVersion))
-$tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("Bazel", $(Get-BazelVersion))
+    $tools.AddToolVersion("Bazelisk", $(Get-BazeliskVersion))
+}
 $tools.AddToolVersion("Bicep", $(Get-BicepVersion))
-$tools.AddToolVersion("Buildah", $(Get-BuildahVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("Buildah", $(Get-BuildahVersion))
+}
 $tools.AddToolVersion("CMake", $(Get-CMakeVersion))
 $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion))
 $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion))
-$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version))
+}
 $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version))
 $tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion))
 $tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion))
@@ -117,7 +127,9 @@ $tools.AddToolVersion("Git", $(Get-GitVersion))
 $tools.AddToolVersion("Git LFS", $(Get-GitLFSVersion))
 $tools.AddToolVersion("Git-ftp", $(Get-GitFTPVersion))
 $tools.AddToolVersion("Haveged", $(Get-HavegedVersion))
-$tools.AddToolVersion("Heroku", $(Get-HerokuVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("Heroku", $(Get-HerokuVersion))
+}
 if (Test-IsUbuntu20) {
     $tools.AddToolVersion("HHVM (HipHop VM)", $(Get-HHVMVersion))
 }
@@ -125,88 +137,123 @@ $tools.AddToolVersion("jq", $(Get-JqVersion))
 $tools.AddToolVersion("Kind", $(Get-KindVersion))
 $tools.AddToolVersion("Kubectl", $(Get-KubectlVersion))
 $tools.AddToolVersion("Kustomize", $(Get-KustomizeVersion))
-$tools.AddToolVersion("Leiningen", $(Get-LeiningenVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("Leiningen", $(Get-LeiningenVersion))
+}
 $tools.AddToolVersion("MediaInfo", $(Get-MediainfoVersion))
 $tools.AddToolVersion("Mercurial", $(Get-HGVersion))
 $tools.AddToolVersion("Minikube", $(Get-MinikubeVersion))
 $tools.AddToolVersion("n", $(Get-NVersion))
 $tools.AddToolVersion("Newman", $(Get-NewmanVersion))
-$tools.AddToolVersion("nvm", $(Get-NvmVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("nvm", $(Get-NvmVersion))
+}
 $tools.AddToolVersion("OpenSSL", $(Get-OpensslVersion))
-$tools.AddToolVersion("Packer", $(Get-PackerVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("Packer", $(Get-PackerVersion))
+}
 $tools.AddToolVersion("Parcel", $(Get-ParcelVersion))
 if (Test-IsUbuntu20) {
     $tools.AddToolVersion("PhantomJS", $(Get-PhantomJSVersion))
 }
-$tools.AddToolVersion("Podman", $(Get-PodManVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("Podman", $(Get-PodManVersion))
+}
 $tools.AddToolVersion("Pulumi", $(Get-PulumiVersion))
-$tools.AddToolVersion("R", $(Get-RVersion))
-$tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("R", $(Get-RVersion))
+    $tools.AddToolVersion("Skopeo", $(Get-SkopeoVersion))
+}
 $tools.AddToolVersion("Sphinx Open Source Search Server", $(Get-SphinxVersion))
-$tools.AddToolVersion("SVN", $(Get-SVNVersion))
-$tools.AddToolVersion("Terraform", $(Get-TerraformVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $tools.AddToolVersion("SVN", $(Get-SVNVersion))
+    $tools.AddToolVersion("Terraform", $(Get-TerraformVersion))
+}
 $tools.AddToolVersion("yamllint", $(Get-YamllintVersion))
 $tools.AddToolVersion("yq", $(Get-YqVersion))
 $tools.AddToolVersion("zstd", $(Get-ZstdVersion))
 
 # CLI Tools
 $cliTools = $installedSoftware.AddHeader("CLI Tools")
-$cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCloudCliVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $cliTools.AddToolVersion("Alibaba Cloud CLI", $(Get-AlibabaCloudCliVersion))
+}
 $cliTools.AddToolVersion("AWS CLI", $(Get-AWSCliVersion))
 $cliTools.AddToolVersion("AWS CLI Session Manager Plugin", $(Get-AWSCliSessionManagerPluginVersion))
 $cliTools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMVersion))
 $cliTools.AddToolVersion("Azure CLI", $(Get-AzureCliVersion))
 $cliTools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion))
 $cliTools.AddToolVersion("GitHub CLI", $(Get-GitHubCliVersion))
-$cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion))
-$cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion))
-$cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion))
-$cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion))
-$cliTools.AddToolVersion("Vercel CLI", $(Get-VerselCliversion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $cliTools.AddToolVersion("Google Cloud CLI", $(Get-GoogleCloudCLIVersion))
+    $cliTools.AddToolVersion("Netlify CLI", $(Get-NetlifyCliVersion))
+    $cliTools.AddToolVersion("OpenShift CLI", $(Get-OCCliVersion))
+    $cliTools.AddToolVersion("ORAS CLI", $(Get-ORASCliVersion))
+    $cliTools.AddToolVersion("Vercel CLI", $(Get-VerselCliversion))
+}
 
-$installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable))
+# Java
+if (-not $(Test-IsUbuntu24)) {
+    $installedSoftware.AddHeader("Java").AddTable($(Get-JavaVersionsTable))
+}
 
+# PHP Tools
 $phpTools = $installedSoftware.AddHeader("PHP Tools")
 $phpTools.AddToolVersionsListInline("PHP", $(Get-PHPVersions), "^\d+\.\d+")
 $phpTools.AddToolVersion("Composer", $(Get-ComposerVersion))
 $phpTools.AddToolVersion("PHPUnit", $(Get-PHPUnitVersion))
 $phpTools.AddNote("Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.")
 
+# Haskell Tools
 $haskellTools = $installedSoftware.AddHeader("Haskell Tools")
 $haskellTools.AddToolVersion("Cabal", $(Get-CabalVersion))
 $haskellTools.AddToolVersion("GHC", $(Get-GHCVersion))
 $haskellTools.AddToolVersion("GHCup", $(Get-GHCupVersion))
 $haskellTools.AddToolVersion("Stack", $(Get-StackVersion))
 
+# Rust Tools
 Initialize-RustEnvironment
 $rustTools = $installedSoftware.AddHeader("Rust Tools")
 $rustTools.AddToolVersion("Cargo", $(Get-CargoVersion))
 $rustTools.AddToolVersion("Rust", $(Get-RustVersion))
 $rustTools.AddToolVersion("Rustdoc", $(Get-RustdocVersion))
 $rustTools.AddToolVersion("Rustup", $(Get-RustupVersion))
+
+# Packages
 $rustToolsPackages = $rustTools.AddHeader("Packages")
-$rustToolsPackages.AddToolVersion("Bindgen", $(Get-BindgenVersion))
-$rustToolsPackages.AddToolVersion("Cargo audit", $(Get-CargoAuditVersion))
-$rustToolsPackages.AddToolVersion("Cargo clippy", $(Get-CargoClippyVersion))
-$rustToolsPackages.AddToolVersion("Cargo outdated", $(Get-CargoOutdatedVersion))
-$rustToolsPackages.AddToolVersion("Cbindgen", $(Get-CbindgenVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $rustToolsPackages.AddToolVersion("Bindgen", $(Get-BindgenVersion))
+    $rustToolsPackages.AddToolVersion("Cargo audit", $(Get-CargoAuditVersion))
+    $rustToolsPackages.AddToolVersion("Cargo clippy", $(Get-CargoClippyVersion))
+    $rustToolsPackages.AddToolVersion("Cargo outdated", $(Get-CargoOutdatedVersion))
+    $rustToolsPackages.AddToolVersion("Cbindgen", $(Get-CbindgenVersion))
+}
 $rustToolsPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion))
 
+# Browsers and Drivers
 $browsersTools = $installedSoftware.AddHeader("Browsers and Drivers")
 $browsersTools.AddToolVersion("Google Chrome", $(Get-ChromeVersion))
 $browsersTools.AddToolVersion("ChromeDriver", $(Get-ChromeDriverVersion))
 $browsersTools.AddToolVersion("Chromium", $(Get-ChromiumVersion))
-$browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion))
-$browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $browsersTools.AddToolVersion("Microsoft Edge", $(Get-EdgeVersion))
+    $browsersTools.AddToolVersion("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion))
+}
 $browsersTools.AddToolVersion("Selenium server", $(Get-SeleniumVersion))
-$browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion))
-$browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion))
+if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
+    $browsersTools.AddToolVersion("Mozilla Firefox", $(Get-FirefoxVersion))
+    $browsersTools.AddToolVersion("Geckodriver", $(Get-GeckodriverVersion))
+}
+
+# Environment variables
 $browsersTools.AddHeader("Environment variables").AddTable($(Build-BrowserWebdriversEnvironmentTable))
 
+# .NET Tools
 $netCoreTools = $installedSoftware.AddHeader(".NET Tools")
 $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotNetCoreSdkVersions), "^\d+\.\d+\.\d")
 $netCoreTools.AddNodes($(Get-DotnetTools))
 
+# Databases
 $databasesTools = $installedSoftware.AddHeader("Databases")
 if (Test-IsUbuntu20) {
     $databasesTools.AddToolVersion("MongoDB", $(Get-MongoDbVersion))
@@ -214,15 +261,21 @@ if (Test-IsUbuntu20) {
 $databasesTools.AddToolVersion("sqlite3", $(Get-SqliteVersion))
 $databasesTools.AddNode($(Build-PostgreSqlSection))
 $databasesTools.AddNode($(Build-MySQLSection))
-$databasesTools.AddNode($(Build-MSSQLToolsSection))
+if (-not $(Test-IsUbuntu24)) {
+    $databasesTools.AddNode($(Build-MSSQLToolsSection))
+}
 
-$cachedTools = $installedSoftware.AddHeader("Cached Tools")
-$cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+")
-$cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+")
-$cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+")
-$cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+")
-$cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+")
+# Cached Tools
+if (-not $(Test-IsUbuntu24)) {
+    $cachedTools = $installedSoftware.AddHeader("Cached Tools")
+    $cachedTools.AddToolVersionsList("Go", $(Get-ToolcacheGoVersions), "^\d+\.\d+")
+    $cachedTools.AddToolVersionsList("Node.js", $(Get-ToolcacheNodeVersions), "^\d+")
+    $cachedTools.AddToolVersionsList("Python", $(Get-ToolcachePythonVersions), "^\d+\.\d+")
+    $cachedTools.AddToolVersionsList("PyPy", $(Get-ToolcachePyPyVersions), "^\d+\.\d+")
+    $cachedTools.AddToolVersionsList("Ruby", $(Get-ToolcacheRubyVersions), "^\d+\.\d+")
+}
 
+# PowerShell Tools
 $powerShellTools = $installedSoftware.AddHeader("PowerShell Tools")
 $powerShellTools.AddToolVersion("PowerShell", $(Get-PowershellVersion))
 $powerShellTools.AddHeader("PowerShell Modules").AddNodes($(Get-PowerShellModules))
@@ -231,9 +284,12 @@ $installedSoftware.AddHeader("Web Servers").AddTable($(Build-WebServersTable))
 
 $androidTools = $installedSoftware.AddHeader("Android")
 $androidTools.AddTable($(Build-AndroidTable))
+
 $androidTools.AddHeader("Environment variables").AddTable($(Build-AndroidEnvironmentTable))
 
-$installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData))
+if (-not $(Test-IsUbuntu24)) {
+    $installedSoftware.AddHeader("Cached Docker images").AddTable($(Get-CachedDockerImagesTableData))
+}
 $installedSoftware.AddHeader("Installed apt packages").AddTable($(Get-AptPackages))
 
 $softwareReport.ToJson() | Out-File -FilePath "${OutputDirectory}/software-report.json" -Encoding UTF8NoBOM

images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1

@@ -10,7 +10,7 @@ function Get-DashVersion {
 
 function Get-CPPVersions {
     $result = Get-CommandResult "apt list --installed" -Multiline
-    $cppVersions = $result.Output | Where-Object { $_ -match "g\+\+-\d+" } | ForEach-Object {
+    $cppVersions = $result.Output | Where-Object { $_ -match "g\+\+-\d\d\/" } | ForEach-Object {
         & $_.Split("/")[0] --version | Select-Object -First 1 | Get-StringPart -Part 3
     } | Sort-Object {[Version] $_}
     return $cppVersions
@@ -18,9 +18,8 @@ function Get-CPPVersions {
 
 function Get-FortranVersions {
     $result = Get-CommandResult "apt list --installed" -Multiline
-    $fortranVersions = $result.Output | Where-Object { $_ -match "^gfortran-\d+" } | ForEach-Object {
-        $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null
-        $Matches.version
+    $fortranVersions = $result.Output | Where-Object { $_ -match "^gfortran-\d\d\/" } | ForEach-Object {
+        & $_.Split("/")[0] --version | Select-Object -First 1 | Get-StringPart -Part 4
     } | Sort-Object {[Version] $_}
     return $fortranVersions
 }
@@ -175,15 +174,13 @@ function Get-ParcelVersion {
 }
 
 function Get-PipVersion {
-    $result = Get-CommandResult "pip --version"
-    $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null
-    return $Matches.version
+    $pipVersion = pip --version | Get-StringPart -Part 1
+    return $pipVersion
 }
 
 function Get-Pip3Version {
-    $result = Get-CommandResult "pip3 --version"
-    $result.Output -match "pip (?<version>\d+\.\d+\.\d+)" | Out-Null
-    return $Matches.version
+    $pip3Version = pip3 --version | Get-StringPart -Part 1
+    return $pip3Version
 }
 
 function Get-VcpkgVersion {

images/ubuntu/scripts/helpers/os.sh

@@ -5,13 +5,13 @@
 ################################################################################
 
 is_ubuntu20() {
-    lsb_release -d | grep -q 'Ubuntu 20'
+    lsb_release -rs | grep -q '20.04'
 }
 
 is_ubuntu22() {
-    lsb_release -d | grep -q 'Ubuntu 22'
+    lsb_release -rs | grep -q '22.04'
 }
 
 is_ubuntu24() {
-    lsb_release -d | grep -q 'Ubuntu 24'
-}
+    lsb_release -rs | grep -q '24.04'
+}

images/ubuntu/scripts/tests/Browsers.Tests.ps1

@@ -1,4 +1,4 @@
-Describe "Firefox" {
+Describe "Firefox" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     It "Firefox" {
         "firefox --version" | Should -ReturnZeroExitCode
     }
@@ -24,7 +24,7 @@ Describe "Chrome" {
     }
 }
 
-Describe "Edge" {
+Describe "Edge" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     It "Edge" {
         "microsoft-edge --version" | Should -ReturnZeroExitCode
     }

images/ubuntu/scripts/tests/CLI.Tools.Tests.ps1

@@ -10,7 +10,7 @@ Describe "Azure DevOps CLI" {
     }
 }
 
-Describe "Aliyun CLI" {
+Describe "Aliyun CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     It "Aliyun CLI" {
         "aliyun version" | Should -ReturnZeroExitCode
     }
@@ -36,19 +36,19 @@ Describe "GitHub CLI" {
     }
 }
 
-Describe "Google Cloud CLI" {
+Describe "Google Cloud CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     It "Google Cloud CLI" {
         "gcloud --version" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "OC CLI" {
+Describe "OC CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     It "OC CLI" {
         "oc version" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "Oras CLI" {
+Describe "Oras CLI" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     It "Oras CLI" {
         "oras version" | Should -ReturnZeroExitCode
     }

images/ubuntu/scripts/tests/Common.Tests.ps1

@@ -24,7 +24,7 @@ Describe "PHP" {
     }
 }
 
-Describe "Swift" {
+Describe "Swift" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     It "swift" {
         "swift --version" | Should -ReturnZeroExitCode
     }

images/ubuntu/scripts/tests/Databases.Tests.ps1

@@ -1,4 +1,4 @@
-Describe "MongoDB" -Skip:(Test-IsUbuntu22) {
+Describe "MongoDB" -Skip:(-not (Test-IsUbuntu20)) {
     It "<ToolName>" -TestCases @(
         @{ ToolName = "mongo" }
         @{ ToolName = "mongod" }

images/ubuntu/scripts/tests/Java.Tests.ps1

@@ -1,6 +1,6 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1" -DisableNameChecking
 
-Describe "Java" {
+Describe "Java" -Skip:(Test-IsUbuntu24) {
     $toolsetJava = (Get-ToolsetContent).java
     $defaultVersion = $toolsetJava.default
     $jdkVersions = $toolsetJava.versions
@@ -17,22 +17,10 @@ Describe "Java" {
     It "<ToolName>" -TestCases @(
         @{ ToolName = "java" }
         @{ ToolName = "javac" }
-        @{ ToolName = "mvn" }
-        @{ ToolName = "ant" }
     ) {
         "$ToolName -version" | Should -ReturnZeroExitCode
     }
 
-    It "Gradle" {
-        "gradle -version" | Should -ReturnZeroExitCode
-
-        $gradleVariableValue = [System.Environment]::GetEnvironmentVariable("GRADLE_HOME")
-        $gradleVariableValue | Should -BeLike "/usr/share/gradle-*"
-
-        $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle"
-        "`"$GradlePath`" -version" | Should -ReturnZeroExitCode
-    }
-
     $testCases = $jdkVersions | ForEach-Object { @{Version = $_ } }
 
     It "Java <Version>" -TestCases $testCases {
@@ -48,3 +36,21 @@ Describe "Java" {
         "`"$javaPath`" -version" | Should -OutputTextMatchingRegex "openjdk\ version\ `"${Version}(\.[0-9_\.]+)?`""
     }
 }
+
+Describe "Java-Tools" {
+    It "Gradle" {
+        "gradle -version" | Should -ReturnZeroExitCode
+
+        $gradleVariableValue = [System.Environment]::GetEnvironmentVariable("GRADLE_HOME")
+        $gradleVariableValue | Should -BeLike "/usr/share/gradle-*"
+
+        $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle"
+        "`"$GradlePath`" -version" | Should -ReturnZeroExitCode
+    }
+    It "<ToolName>" -TestCases @(
+        @{ ToolName = "mvn" }
+        @{ ToolName = "ant" }
+    ) {
+        "$ToolName -version" | Should -ReturnZeroExitCode
+    }
+}

images/ubuntu/scripts/tests/Tools.Tests.ps1

@@ -1,3 +1,4 @@
+Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 Describe "azcopy" {
     It "azcopy" {
         "azcopy --version" | Should -ReturnZeroExitCode
@@ -36,8 +37,12 @@ Describe "Rust" {
     It "Rustfmt is installed" {
         "rustfmt --version" | Should -ReturnZeroExitCode
     }
+    
+    It "cargo" {
+        "cargo --version" | Should -ReturnZeroExitCode
+    }
 
-    Context "Cargo dependencies" {
+    Context "Cargo dependencies" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
         It "bindgen" {
             "bindgen --version" | Should -ReturnZeroExitCode
         }
@@ -46,10 +51,6 @@ Describe "Rust" {
             "cbindgen --version" | Should -ReturnZeroExitCode
         }
 
-        It "cargo" {
-            "cargo --version" | Should -ReturnZeroExitCode
-        }
-
         It "cargo-clippy" {
             "cargo-clippy --version" | Should -ReturnZeroExitCode
         }
@@ -105,7 +106,7 @@ Describe "Docker images" {
     }
 }
 
-Describe "Docker-compose v1" {
+Describe "Docker-compose v1" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "docker-compose" {
         "docker-compose --version"| Should -ReturnZeroExitCode
     }
@@ -117,7 +118,7 @@ Describe "Ansible" {
     }
 }
 
-Describe "Bazel" {
+Describe "Bazel" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "<ToolName>" -TestCases @(
         @{ ToolName = "bazel" }
         @{ ToolName = "bazelisk" }
@@ -144,7 +145,7 @@ Describe "Cmake" {
     }
 }
 
-Describe "erlang" -Skip:(Test-IsUbuntu22) {
+Describe "erlang" -Skip:(-not (Test-IsUbuntu20)) {
     $testCases = @("erl -version", "erlc -v", "rebar3 -v") | ForEach-Object { @{ErlangCommand = $_} }
 
     It "erlang <ErlangCommand>" -TestCases $testCases {
@@ -168,7 +169,7 @@ Describe "gfortran" {
     }
 }
 
-Describe "Mono" {
+Describe "Mono" -Skip:(Test-IsUbuntu24) {
     It "mono" {
         "mono --version" | Should -ReturnZeroExitCode
     }
@@ -182,25 +183,25 @@ Describe "Mono" {
     }
 }
 
-Describe "MSSQLCommandLineTools" {
+Describe "MSSQLCommandLineTools" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "sqlcmd" {
         "sqlcmd -?" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "SqlPackage" {
+Describe "SqlPackage" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "sqlpackage" {
         "sqlpackage /version" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "R" {
+Describe "R" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "r" {
         "R --version" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "Sbt" {
+Describe "Sbt" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "sbt" {
         "sbt --version" | Should -ReturnZeroExitCode
     }
@@ -213,7 +214,7 @@ Describe "Selenium" {
     }
 }
 
-Describe "Terraform" {
+Describe "Terraform" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "terraform" {
         "terraform --version" | Should -ReturnZeroExitCode
     }
@@ -251,13 +252,13 @@ Describe "Git-lfs" {
     }
 }
 
-Describe "Heroku" {
+Describe "Heroku" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "heroku" {
         "heroku --version" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "HHVM" -Skip:(Test-IsUbuntu22) {
+Describe "HHVM" -Skip:(-not (Test-IsUbuntu20)) {
     It "hhvm" {
         "hhvm --version" | Should -ReturnZeroExitCode
     }
@@ -297,7 +298,7 @@ Describe "Kubernetes tools" {
     }
 }
 
-Describe "Leiningen" {
+Describe "Leiningen" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "leiningen" {
         "lein --version" | Should -ReturnZeroExitCode
     }
@@ -309,7 +310,7 @@ Describe "Conda" {
     }
 }
 
-Describe "Packer" {
+Describe "Packer" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "packer" {
         "packer --version" | Should -ReturnZeroExitCode
     }
@@ -321,14 +322,14 @@ Describe "Pulumi" {
     }
 }
 
-Describe "Phantomjs" -Skip:(Test-IsUbuntu22) {
+Describe "Phantomjs" -Skip:(-not (Test-IsUbuntu20)) {
     It "phantomjs" {
         $env:OPENSSL_CONF="/etc/ssl"
         "phantomjs --version" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "Containers" {
+Describe "Containers" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     $testCases = @("podman", "buildah", "skopeo") | ForEach-Object { @{ContainerCommand = $_} }
 
     It "<ContainerCommand>" -TestCases $testCases {
@@ -344,7 +345,7 @@ Describe "Containers" {
 
 }
 
-Describe "nvm" {
+Describe "nvm" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "nvm" {
         "source /etc/skel/.nvm/nvm.sh && nvm --version" | Should -ReturnZeroExitCode
     }
@@ -380,7 +381,7 @@ Describe "yq" {
     }
 }
 
-Describe "Kotlin" {
+Describe "Kotlin" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu20))) {
     It "kapt" {
         "kapt -version" | Should -ReturnZeroExitCode
     }

images/ubuntu/scripts/tests/Toolset.Tests.ps1

@@ -1,4 +1,4 @@
-Describe "Toolset" {
+Describe "Toolset" -Skip:((-not (Test-IsUbuntu20)) -and (-not (Test-IsUbuntu22))) {
     $tools = (Get-ToolsetContent).toolcache
 
     $toolsExecutables = @{