Skip to content

Commit daabdeb

Browse files
[anaconda] Update patches for GHSA-5cpq-8wj7-hf2v and GHSA-45c4-8wx5-qw6w (#739)
* Update patches - Enable patch for GHSA-5cpq-8wj7-hf2v; - Rework patch for GHSA-45c4-8wx5-qw6w to install package from conda repo. * Enable tests * Update tests - Remove comments
1 parent 99accaf commit daabdeb

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/anaconda/.devcontainer/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ RUN . /etc/os-release && if [ "${VERSION_CODENAME}" != "bullseye" ]; then exit 1
88
RUN conda install \
99
# https://github.com/advisories/GHSA-5cpq-8wj7-hf2v
1010
pyopenssl=23.2.0 \
11-
# cryptography=41.0.2 # Disabled temporarily due to issue with conda \
11+
cryptography=41.0.2 \
1212
# https://github.com/advisories/GHSA-j8r2-6x86-q33q
1313
requests=2.31.0 \
1414
# https://github.com/advisories/GHSA-f865-m6cq-j9vx
15-
mpmath==1.3.0
15+
mpmath=1.3.0 \
16+
# https://github.com/advisories/GHSA-45c4-8wx5-qw6w
17+
aiohttp=3.8.5
1618

1719
RUN python3 -m pip install --upgrade \
1820
# https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21797
@@ -30,9 +32,7 @@ RUN python3 -m pip install --upgrade \
3032
# https://github.com/advisories/GHSA-qppv-j76h-2rpx
3133
tornado==6.3.3 \
3234
# https://github.com/advisories/GHSA-282v-666c-3fvg
33-
transformers==4.30.0 \
34-
# https://github.com/advisories/GHSA-45c4-8wx5-qw6w
35-
aiohttp==3.8.5
35+
transformers==4.30.0
3636

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

src/anaconda/test-project/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ checkPythonPackageVersion "nbconvert" "6.5.1"
4040
checkPythonPackageVersion "werkzeug" "2.2.3"
4141
checkPythonPackageVersion "certifi" "2022.12.07"
4242
checkPythonPackageVersion "requests" "2.31.0"
43-
# checkPythonPackageVersion "cryptography" "41.0.2" # Disabled temporarily due to issue with conda
43+
checkPythonPackageVersion "cryptography" "41.0.2"
4444
checkPythonPackageVersion "torch" "1.13.1"
4545
checkPythonPackageVersion "transformers" "4.30.0"
4646
checkPythonPackageVersion "mpmath" "1.3.0"
@@ -51,7 +51,7 @@ tornado_version=$(python -c "import tornado; print(tornado.version)")
5151
check-version-ge "tornado-requirement" "${tornado_version}" "6.3.3"
5252

5353
checkCondaPackageVersion "pyopenssl" "23.2.0"
54-
# checkCondaPackageVersion "cryptography" "41.0.2" # Disabled temporarily due to issue with conda
54+
checkCondaPackageVersion "cryptography" "41.0.2"
5555
checkCondaPackageVersion "requests" "2.31.0"
5656
checkCondaPackageVersion "pygments" "2.15.1"
5757
checkCondaPackageVersion "mpmath" "1.3.0"

0 commit comments

Comments
 (0)