Skip to content

Commit 1d4608c

Browse files
[miniconda] Rework patch for GHSA-v845-jxx5-vc9f (devcontainers#822)
* Rework patch for GHSA-v845-jxx5-vc9f * Update tests
1 parent d126604 commit 1d4608c

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/miniconda/.devcontainer/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ RUN conda install \
88
# https://github.com/advisories/GHSA-jm77-qphf-c4w8
99
cryptography=41.0.3 \
1010
# https://github.com/advisories/GHSA-j8r2-6x86-q33q
11-
requests=2.31.0
12-
13-
RUN python3 -m pip install --upgrade \
11+
requests=2.31.0 \
1412
# https://github.com/advisories/GHSA-v845-jxx5-vc9f
15-
urllib3==1.26.17
13+
urllib3==1.26.18
1614

1715
# Reset and copy updated files with updated privs to keep image size down
1816
FROM mcr.microsoft.com/devcontainers/base:1-bullseye

src/miniconda/test-project/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
2121
checkPythonPackageVersion "cryptography" "41.0.3"
2222
checkPythonPackageVersion "setuptools" "65.5.1"
2323
checkPythonPackageVersion "wheel" "0.38.1"
24-
checkPythonPackageVersion "urllib3" "1.26.17"
2524

2625
checkCondaPackageVersion "cryptography" "41.0.3"
2726
checkCondaPackageVersion "pyopenssl" "23.2.0"
2827
checkCondaPackageVersion "setuptools" "65.5.1"
2928
checkCondaPackageVersion "wheel" "0.38.1"
3029
checkCondaPackageVersion "requests" "2.31.0"
30+
checkCondaPackageVersion "urllib3" "1.26.17"
3131

3232
check "conda-update-conda" bash -c "conda update -y conda"
3333
check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"

0 commit comments

Comments
 (0)