From 07dd8c3049fd918100ebad3b44fd4a89f17db783 Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Wed, 22 May 2024 15:07:53 +0000
Subject: [PATCH 1/3] Reverted cryptography change for library path issue

---
 src/miniconda/.devcontainer/Dockerfile | 6 +++++-
 src/miniconda/test-project/test.sh     | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/miniconda/.devcontainer/Dockerfile b/src/miniconda/.devcontainer/Dockerfile
index 83b6389bd5..d085c5ecb8 100644
--- a/src/miniconda/.devcontainer/Dockerfile
+++ b/src/miniconda/.devcontainer/Dockerfile
@@ -6,9 +6,13 @@ RUN conda install \
     # https://github.com/advisories/GHSA-jjg7-2v4v-x38h
     idna==3.7
 
+RUN conda install \
+    # https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
+    cryptography==42.0.5
+    
 RUN python3 -m pip install --upgrade \
     # https://github.com/advisories/GHSA-6vqw-3v5j-54x4
-    cryptography==42.0.4 \
+    # cryptography==42.0.4 \
     # installed for compatibility with cryptography v42.0.4
     pyopenssl==24.0.0
 
diff --git a/src/miniconda/test-project/test.sh b/src/miniconda/test-project/test.sh
index c8a50b3414..7fecbfa6cc 100755
--- a/src/miniconda/test-project/test.sh
+++ b/src/miniconda/test-project/test.sh
@@ -18,11 +18,11 @@ check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcont
 
 check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
 
-checkPythonPackageVersion "cryptography" "42.0.4"
+checkPythonPackageVersion "cryptography" "42.0.5"
 checkPythonPackageVersion "setuptools" "65.5.1"
 checkPythonPackageVersion "wheel" "0.38.1"
 
-checkCondaPackageVersion "cryptography" "42.0.4"
+checkCondaPackageVersion "cryptography" "42.0.5"
 checkCondaPackageVersion "pyopenssl" "24.0.0"
 checkCondaPackageVersion "setuptools" "65.5.1"
 checkCondaPackageVersion "wheel" "0.38.1"

From 878c891c935cb31952548e6dbdc94f7a68074f21 Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Wed, 22 May 2024 15:07:53 +0000
Subject: [PATCH 2/3] LD_LIBRARY_PATH issue fixed

---
 src/miniconda-devcontainer-test        | 1 +
 src/miniconda/.devcontainer/Dockerfile | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)
 create mode 160000 src/miniconda-devcontainer-test

diff --git a/src/miniconda-devcontainer-test b/src/miniconda-devcontainer-test
new file mode 160000
index 0000000000..daef784da7
--- /dev/null
+++ b/src/miniconda-devcontainer-test
@@ -0,0 +1 @@
+Subproject commit daef784da73953211489887bc109b98c14984926
diff --git a/src/miniconda/.devcontainer/Dockerfile b/src/miniconda/.devcontainer/Dockerfile
index d085c5ecb8..1acc4ed83a 100644
--- a/src/miniconda/.devcontainer/Dockerfile
+++ b/src/miniconda/.devcontainer/Dockerfile
@@ -6,13 +6,11 @@ RUN conda install \
     # https://github.com/advisories/GHSA-jjg7-2v4v-x38h
     idna==3.7
 
-RUN conda install \
-    # https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
-    cryptography==42.0.5
+RUN ENV LD_LIBRARY_PATH=/opt/conda/lib
     
 RUN python3 -m pip install --upgrade \
     # https://github.com/advisories/GHSA-6vqw-3v5j-54x4
-    # cryptography==42.0.4 \
+    cryptography==42.0.4 \
     # installed for compatibility with cryptography v42.0.4
     pyopenssl==24.0.0
 

From 77e11811600ee1abc3b5a758b869d100daf0096a Mon Sep 17 00:00:00 2001
From: Prathamesh Zarkar <159782310+prathameshzarkar9@users.noreply.github.com>
Date: Wed, 22 May 2024 15:07:54 +0000
Subject: [PATCH 3/3] test cases failing due to RUN change it to ENV

---
 src/miniconda/.devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miniconda/.devcontainer/Dockerfile b/src/miniconda/.devcontainer/Dockerfile
index 1acc4ed83a..48fb48f005 100644
--- a/src/miniconda/.devcontainer/Dockerfile
+++ b/src/miniconda/.devcontainer/Dockerfile
@@ -6,7 +6,7 @@ RUN conda install \
     # https://github.com/advisories/GHSA-jjg7-2v4v-x38h
     idna==3.7
 
-RUN ENV LD_LIBRARY_PATH=/opt/conda/lib
+ENV LD_LIBRARY_PATH=/opt/conda/lib
     
 RUN python3 -m pip install --upgrade \
     # https://github.com/advisories/GHSA-6vqw-3v5j-54x4