Merge branch 'main' into tfgrunt-terragrunt

Author: kevcube

.github/workflows/release.yaml

@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       packages: write
+      contents: write
     steps:
       - uses: actions/checkout@v4
 
@@ -20,4 +21,4 @@ jobs:
           publish-features: "true"
           base-path-to-features: "./src"
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test-pr.yaml

@@ -57,6 +57,11 @@ jobs:
             "mcr.microsoft.com/devcontainers/base:debian",
             "mcr.microsoft.com/devcontainers/base:noble"
           ]
+        exclude:
+          - features: oryx
+            baseImage: ubuntu:jammy
+          - features: oryx
+            baseImage: mcr.microsoft.com/devcontainers/base:ubuntu
     steps:
       - uses: actions/checkout@v4
 

src/aws-cli/install.sh

@@ -68,7 +68,7 @@ check_packages() {
 
 export DEBIAN_FRONTEND=noninteractive
 
-check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion
+check_packages curl ca-certificates gnupg2 dirmngr unzip bash-completion less
 
 verify_aws_cli_gpg_signature() {
     local filePath=$1

src/azure-cli/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "azure-cli",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "name": "Azure CLI",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
   "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@@ -23,6 +23,14 @@
       "description": "Optionally install Azure Bicep",
       "default": false
     },
+    "bicepVersion": {
+      "type": "string",
+      "proposals": [
+        "latest"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Bicep version. ('latest' or a specic version such as 'v0.31.92')"
+    },
     "installUsingPython": {
       "type": "boolean",
       "description": "Install Azure CLI using Python instead of pipx",

src/azure-cli/install.sh

@@ -15,6 +15,7 @@ rm -rf /var/lib/apt/lists/*
 AZ_VERSION=${VERSION:-"latest"}
 AZ_EXTENSIONS=${EXTENSIONS}
 AZ_INSTALLBICEP=${INSTALLBICEP:-false}
+AZ_BICEPVERSION=${BICEPVERSION:-latest}
 INSTALL_USING_PYTHON=${INSTALLUSINGPYTHON:-false}
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 AZCLI_ARCHIVE_ARCHITECTURES="amd64 arm64"
@@ -229,10 +230,16 @@ if [ "${AZ_INSTALLBICEP}" = "true" ]; then
     # The `az bicep install --target-platform` could be a solution; however, linux-arm64 is not an allowed value for this argument yet
     # Manually installing Bicep and moving to the appropriate directory where az expects it to be
 
+    if [ "${AZ_BICEPVERSION}" = "latest" ]; then
+        bicep_download_path="https://github.com/Azure/bicep/releases/latest/download"
+    else
+        bicep_download_path="https://github.com/Azure/bicep/releases/download/${AZ_BICEPVERSION}"
+    fi
+
     if [ "${architecture}" = "arm64" ]; then
-        curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-arm64
+        curl -Lo bicep ${bicep_download_path}/bicep-linux-arm64
     else 
-        curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64
+        curl -Lo bicep ${bicep_download_path}/bicep-linux-x64
     fi
 
     chmod +x ./bicep

src/common-utils/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.5.1",
+    "version": "2.5.2",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

src/common-utils/main.sh

@@ -551,7 +551,9 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
 
         # Add devcontainer .zshrc template
         if [ "$INSTALL_OH_MY_ZSH_CONFIG" = "true" ]; then
-            echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+            if ! [ -f "${template_path}" ] || ! grep -qF "$(head -n 1 "${template_path}")" "${user_rc_file}"; then
+                echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
+            fi
             sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
         fi
 

src/docker-in-docker/install.sh

@@ -312,6 +312,7 @@ else
     else
         apt-get -y install --no-install-recommends docker-ce-cli${cli_version_suffix} docker-ce${engine_version_suffix}
         # Install compose
+        apt-mark hold docker-ce docker-ce-cli
         apt-get -y install --no-install-recommends docker-compose-plugin || echo "(*) Package docker-compose-plugin (Docker Compose v2) not available for OS ${ID} ${VERSION_CODENAME} (${architecture}). Skipping."
     fi
 fi

src/docker-outside-of-docker/devcontainer-feature.json

@@ -61,6 +61,9 @@
             "type": "bind"
         }
     ],
+    "securityOpt": [
+        "label=disable"
+    ],
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"
     ],

src/dotnet/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.1.3",
+    "version": "2.2.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",