Merge branch 'main' into patch-1

Author: Kaniska244

src/ruby/README.md

@@ -9,7 +9,7 @@
 | *Categories* | Core, Languages |
 | *Image type* | Dockerfile |
 | *Published images* | mcr.microsoft.com/devcontainers/ruby |
-| *Available image variants* | 4 / 4-trixie, 4-bookworm, 3.4 / 3.4-trixie, 3.3 / 3.3-trixie, 3.2 / 3.2-trixie, 3-bookworm, 3.4-bookworm, 3.3-bookworm, 3.2-bookworm, 3-bullseye, 3.4-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
+| *Available image variants* | 4 / 4-trixie, 4-bookworm, 3.4 / 3.4-trixie, 3.3 / 3.3-trixie, 3.4-bookworm, 3.3-bookworm, 3.4-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/ruby/tags/list)) |
 | *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, `bookworm` , and `bullseye` variants |
 | *Container host OS support* | Linux, macOS, Windows |
 | *Container OS* | Debian |
@@ -25,7 +25,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
 - `mcr.microsoft.com/devcontainers/ruby:4`   (or `4-trixie`, `4-bookworm` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/ruby:3.4` (or `3.4-trixie`, `3.4-bookworm`, `3.4-bullseye` to pin to an OS version)
 - `mcr.microsoft.com/devcontainers/ruby:3.3` (or `3.3-trixie`, `3.3-bookworm`, `3.3-bullseye` to pin to an OS version)
-- `mcr.microsoft.com/devcontainers/ruby:3.2` (or `3.2-trixie`, `3.2-bookworm`, `3.2-bullseye` to pin to an OS version)
 
 Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
 

src/ruby/manifest.json

@@ -1,17 +1,14 @@
 {
-	"version": "3.0.3",
+	"version": "3.0.4",
 	"variants": [
 		"4.0-trixie",
 		"3.4-trixie",		
 		"3.3-trixie",
-		"3.2-trixie",
 		"4.0-bookworm",		
 		"3.4-bookworm",		
 		"3.3-bookworm",
-		"3.2-bookworm",
 		"3.4-bullseye",		
-		"3.3-bullseye",
-		"3.2-bullseye"
+		"3.3-bullseye"
 	],
 	"build": {
 		"latest": "4.0-trixie",
@@ -32,10 +29,6 @@
 			"3.3-trixie": [
 				"linux/amd64",
 				"linux/arm64"
-			],
-			"3.2-trixie": [
-				"linux/amd64",
-				"linux/arm64"
 			],			
 			"3.4-bookworm": [
 				"linux/amd64",
@@ -45,21 +38,13 @@
 				"linux/amd64",
 				"linux/arm64"
 			],
-			"3.2-bookworm": [
-				"linux/amd64",
-				"linux/arm64"
-			],
 			"3.4-bullseye": [
 				"linux/amd64",
 				"linux/arm64"
 			],			
 			"3.3-bullseye": [
 				"linux/amd64",
 				"linux/arm64"
-			],
-			"3.2-bullseye": [
-				"linux/amd64",
-				"linux/arm64"
 			]
 		},
 		"tags": [
@@ -84,27 +69,17 @@
 				"ruby:${VERSION}-3.3",
 				"ruby:${VERSION}-3.3-trixie"
 			],			
-			"3.2-trixie": [
-				"ruby:${VERSION}-3.2",
-				"ruby:${VERSION}-3.2-trixie"
-			],			
 			"3.4-bookworm": [
 				"ruby:${VERSION}-3.4-bookworm"
 			],
 			"3.3-bookworm": [
 				"ruby:${VERSION}-3.3-bookworm"
 			],			
-			"3.2-bookworm": [
-				"ruby:${VERSION}-3.2-bookworm"
-			],
 			"3.4-bullseye": [
 				"ruby:${VERSION}-3.4-bullseye"
 			],
 			"3.3-bullseye": [
 				"ruby:${VERSION}-3.3-bullseye"
-			],			
-			"3.2-bullseye": [
-				"ruby:${VERSION}-3.2-bullseye"
 			]
 		}
 	},

src/universal/.devcontainer/Dockerfile

@@ -84,20 +84,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     # Remove scripts now that we're done with them
     && apt-get clean -y && rm -rf /tmp/scripts
 
-# Install libssl1.1 for oryx compatibility based on architecture
-RUN ARCH=$(uname -m) && \
-    if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "amd64" ]; then \
-        curl -fsSL -o libssl1.1_1.1.0g-2ubuntu4_amd64.deb http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
-        dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
-        rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb; \
-    elif [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then \
-        curl -fsSL -o libssl1.1_1.1.1f-1ubuntu2_arm64.deb http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_arm64.deb && \
-        dpkg -i libssl1.1_1.1.1f-1ubuntu2_arm64.deb && \
-        rm libssl1.1_1.1.1f-1ubuntu2_arm64.deb; \
-    else \
-        echo "Unsupported architecture: $ARCH" && exit 1; \
-    fi
-
 # Default to bash shell (other shells available at /usr/bin/fish and /usr/bin/zsh)
 ENV SHELL=/bin/bash \
     DOCKER_BUILDKIT=1

src/universal/.devcontainer/devcontainer-lock.json

@@ -5,10 +5,10 @@
       "resolved": "ghcr.io/devcontainers/features/common-utils@sha256:dbf431d6b42d55cde50fa1df75c7f7c3999a90cde6d73f7a7071174b3c3d0cc4",
       "integrity": "sha256:dbf431d6b42d55cde50fa1df75c7f7c3999a90cde6d73f7a7071174b3c3d0cc4"
     },
-    "ghcr.io/devcontainers/features/conda:1": {
-      "version": "1.2.5",
-      "resolved": "ghcr.io/devcontainers/features/conda@sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b",
-      "integrity": "sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b"
+    "ghcr.io/devcontainers/features/conda:2": {
+      "version": "2.0.1",
+      "resolved": "ghcr.io/devcontainers/features/conda@sha256:f5f3e5b96a33a90377eba3be0fdba7aef6a128b5702571e1f586b2c9e0083840",
+      "integrity": "sha256:f5f3e5b96a33a90377eba3be0fdba7aef6a128b5702571e1f586b2c9e0083840"
     },
     "ghcr.io/devcontainers/features/copilot-cli:1": {
       "version": "1.0.0",
@@ -51,9 +51,9 @@
       "integrity": "sha256:15465c956810aa164c9644b6df5ca36f6cac3e7a86b7dcc474a1fb830b21c509"
     },
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "1.7.2",
-      "resolved": "ghcr.io/devcontainers/features/java@sha256:e75d274ac969b29a59ba6f34c2d098f6a52144d0ec027ef326b724ea4b8b7b4e",
-      "integrity": "sha256:e75d274ac969b29a59ba6f34c2d098f6a52144d0ec027ef326b724ea4b8b7b4e"
+      "version": "1.8.0",
+      "resolved": "ghcr.io/devcontainers/features/java@sha256:9663ce0219ff85786e87901ce5f0a59f488edd5f99b46015192cda48468b233a",
+      "integrity": "sha256:9663ce0219ff85786e87901ce5f0a59f488edd5f99b46015192cda48468b233a"
     },
     "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
       "version": "1.3.1",

src/universal/.devcontainer/devcontainer.json

@@ -34,7 +34,7 @@
             "additionalVersions": "8.4.15",
             "installComposer": "true"
         },
-        "ghcr.io/devcontainers/features/conda:1": {
+        "ghcr.io/devcontainers/features/conda:2": {
             "version": "latest"
         },
         "ghcr.io/devcontainers/features/ruby:1": {

src/universal/.devcontainer/local-features/patch-conda/install.sh

@@ -56,17 +56,5 @@ update_conda_package pyopenssl "26.0.0"
 
 update_conda_package cryptography "46.0.5"
 
-# https://github.com/advisories/GHSA-9hjg-9r4m-mvj7
-update_conda_package requests "2.32.4"
-
-# https://github.com/advisories/GHSA-5rjg-fvgr-3xxf
-update_conda_package setuptools "78.1.1"
-
-# https://github.com/advisories/GHSA-g7vv-2v7x-gj9p
-update_python_package /opt/conda/bin/python3 tqdm "4.66.3"
-
-# https://github.com/advisories/GHSA-38jv-5279-wg99
-update_conda_package urllib3 "2.6.3"
-
 # https://nvd.nist.gov/vuln/detail/CVE-2025-6176
 update_conda_package brotli "1.2.0"

src/universal/manifest.json

@@ -1,5 +1,5 @@
 {
-	"version": "6.0.1",
+	"version": "6.0.2",
 	"build": {
 		"latest": true,
 		"rootDistro": "debian",