Skip to content

Commit 4414a49

Browse files
authored
[universal] - Update conda feature and remove obsolete openssl 1.1 installation logic (#1834)
* [universal] - Update conda feature and change ubuntu mirror to https * Change Dockerfile * Remove unnecessary changes in patch-conda
1 parent bae3d7b commit 4414a49

5 files changed

Lines changed: 9 additions & 35 deletions

File tree

src/universal/.devcontainer/Dockerfile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
8484
# Remove scripts now that we're done with them
8585
&& apt-get clean -y && rm -rf /tmp/scripts
8686

87-
# Install libssl1.1 for oryx compatibility based on architecture
88-
RUN ARCH=$(uname -m) && \
89-
if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "amd64" ]; then \
90-
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 && \
91-
dpkg -i libssl1.1_1.1.0g-2ubuntu4_amd64.deb && \
92-
rm libssl1.1_1.1.0g-2ubuntu4_amd64.deb; \
93-
elif [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then \
94-
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 && \
95-
dpkg -i libssl1.1_1.1.1f-1ubuntu2_arm64.deb && \
96-
rm libssl1.1_1.1.1f-1ubuntu2_arm64.deb; \
97-
else \
98-
echo "Unsupported architecture: $ARCH" && exit 1; \
99-
fi
100-
10187
# Default to bash shell (other shells available at /usr/bin/fish and /usr/bin/zsh)
10288
ENV SHELL=/bin/bash \
10389
DOCKER_BUILDKIT=1

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"resolved": "ghcr.io/devcontainers/features/common-utils@sha256:dbf431d6b42d55cde50fa1df75c7f7c3999a90cde6d73f7a7071174b3c3d0cc4",
66
"integrity": "sha256:dbf431d6b42d55cde50fa1df75c7f7c3999a90cde6d73f7a7071174b3c3d0cc4"
77
},
8-
"ghcr.io/devcontainers/features/conda:1": {
9-
"version": "1.2.5",
10-
"resolved": "ghcr.io/devcontainers/features/conda@sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b",
11-
"integrity": "sha256:d189cf17997854b28c7ffbab5db70f9b7d70332d97dfbf44447e48e958a03c8b"
8+
"ghcr.io/devcontainers/features/conda:2": {
9+
"version": "2.0.1",
10+
"resolved": "ghcr.io/devcontainers/features/conda@sha256:f5f3e5b96a33a90377eba3be0fdba7aef6a128b5702571e1f586b2c9e0083840",
11+
"integrity": "sha256:f5f3e5b96a33a90377eba3be0fdba7aef6a128b5702571e1f586b2c9e0083840"
1212
},
1313
"ghcr.io/devcontainers/features/copilot-cli:1": {
1414
"version": "1.0.0",
@@ -51,9 +51,9 @@
5151
"integrity": "sha256:15465c956810aa164c9644b6df5ca36f6cac3e7a86b7dcc474a1fb830b21c509"
5252
},
5353
"ghcr.io/devcontainers/features/java:1": {
54-
"version": "1.7.2",
55-
"resolved": "ghcr.io/devcontainers/features/java@sha256:e75d274ac969b29a59ba6f34c2d098f6a52144d0ec027ef326b724ea4b8b7b4e",
56-
"integrity": "sha256:e75d274ac969b29a59ba6f34c2d098f6a52144d0ec027ef326b724ea4b8b7b4e"
54+
"version": "1.8.0",
55+
"resolved": "ghcr.io/devcontainers/features/java@sha256:9663ce0219ff85786e87901ce5f0a59f488edd5f99b46015192cda48468b233a",
56+
"integrity": "sha256:9663ce0219ff85786e87901ce5f0a59f488edd5f99b46015192cda48468b233a"
5757
},
5858
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
5959
"version": "1.3.1",

src/universal/.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"additionalVersions": "8.4.15",
3535
"installComposer": "true"
3636
},
37-
"ghcr.io/devcontainers/features/conda:1": {
37+
"ghcr.io/devcontainers/features/conda:2": {
3838
"version": "latest"
3939
},
4040
"ghcr.io/devcontainers/features/ruby:1": {

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,5 @@ update_conda_package pyopenssl "26.0.0"
5656

5757
update_conda_package cryptography "46.0.5"
5858

59-
# https://github.com/advisories/GHSA-9hjg-9r4m-mvj7
60-
update_conda_package requests "2.32.4"
61-
62-
# https://github.com/advisories/GHSA-5rjg-fvgr-3xxf
63-
update_conda_package setuptools "78.1.1"
64-
65-
# https://github.com/advisories/GHSA-g7vv-2v7x-gj9p
66-
update_python_package /opt/conda/bin/python3 tqdm "4.66.3"
67-
68-
# https://github.com/advisories/GHSA-38jv-5279-wg99
69-
update_conda_package urllib3 "2.6.3"
70-
7159
# https://nvd.nist.gov/vuln/detail/CVE-2025-6176
7260
update_conda_package brotli "1.2.0"

src/universal/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.0.1",
2+
"version": "6.0.2",
33
"build": {
44
"latest": true,
55
"rootDistro": "debian",

0 commit comments

Comments
 (0)