[miniconda] Rework patch for GHSA-v845-jxx5-vc9f (#822)

* Rework patch for GHSA-v845-jxx5-vc9f * Update tests
devcontainers · Oct 27, 2023 · 1d4608c · 1d4608c
1 parent d126604
commit 1d4608c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/miniconda/.devcontainer/Dockerfile b/src/miniconda/.devcontainer/Dockerfile
@@ -8,11 +8,9 @@ RUN conda install \
     # https://github.com/advisories/GHSA-jm77-qphf-c4w8
     cryptography=41.0.3 \
     # https://github.com/advisories/GHSA-j8r2-6x86-q33q
-    requests=2.31.0
-
-RUN python3 -m pip install --upgrade \
+    requests=2.31.0 \
     # https://github.com/advisories/GHSA-v845-jxx5-vc9f
-    urllib3==1.26.17
+    urllib3==1.26.18
 
 # Reset and copy updated files with updated privs to keep image size down
 FROM mcr.microsoft.com/devcontainers/base:1-bullseye

diff --git a/src/miniconda/test-project/test.sh b/src/miniconda/test-project/test.sh
@@ -21,13 +21,13 @@ check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
 checkPythonPackageVersion "cryptography" "41.0.3"
 checkPythonPackageVersion "setuptools" "65.5.1"
 checkPythonPackageVersion "wheel" "0.38.1"
-checkPythonPackageVersion "urllib3" "1.26.17"
 
 checkCondaPackageVersion "cryptography" "41.0.3"
 checkCondaPackageVersion "pyopenssl" "23.2.0"
 checkCondaPackageVersion "setuptools" "65.5.1"
 checkCondaPackageVersion "wheel" "0.38.1"
 checkCondaPackageVersion "requests" "2.31.0"
+checkCondaPackageVersion "urllib3" "1.26.17"
 
 check "conda-update-conda" bash -c "conda update -y conda"
 check "conda-install-tensorflow" bash -c "conda create --name test-env -c conda-forge --yes tensorflow"