Skip to content

Commit

Permalink
[anaconda] Rework patch for GHSA-94vc-p8w7-5p49
Browse files Browse the repository at this point in the history
- Update `setuptools` and `wheel` to avoid potential issues with installing newer versions of packages;
- Bump "imagecodecs" version;
- Add test for "imagecodecs" minimum version;
  • Loading branch information
alexander-smolyakov committed Oct 18, 2023
1 parent 3f31d02 commit bf55a11
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/anaconda/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ RUN . /etc/os-release && if [ "${VERSION_CODENAME}" != "bullseye" ]; then exit 1

# Temporary: Upgrade python packages due to mentioned CVEs
# They are installed by the base image (continuumio/anaconda3) which does not have the patch.
RUN conda install \
RUN conda install \
# Update "setuptools" and "wheel" to avoid potential issues with installing newer versions of packages
setuptools=68.0.0 \
wheel=0.41.2 \
# pyopenssl should be updated to be compatible with latest version of cryptography
pyopenssl=23.2.0 \
pyopenssl=23.2.0 \
# https://github.com/advisories/GHSA-jm77-qphf-c4w8
cryptography=41.0.3 \
# https://github.com/advisories/GHSA-j8r2-6x86-q33q
Expand Down Expand Up @@ -39,7 +42,9 @@ RUN python3 -m pip install --upgrade \
# https://github.com/advisories/GHSA-r726-vmfq-j9j3
jupyter_server==2.7.2 \
# https://github.com/advisories/GHSA-v845-jxx5-vc9f
urllib3==1.26.17
urllib3==1.26.17 \
# https://github.com/advisories/GHSA-94vc-p8w7-5p49
imagecodecs==2023.9.18

# Reset and copy updated files with updated privs to keep image size down
FROM mcr.microsoft.com/devcontainers/base:1-bullseye
Expand Down
1 change: 1 addition & 0 deletions src/anaconda/test-project/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ checkPythonPackageVersion "mpmath" "1.3.0"
checkPythonPackageVersion "aiohttp" "3.8.5"
checkPythonPackageVersion "jupyter_server" "2.7.2"
checkPythonPackageVersion "urllib3" "1.26.17"
checkPythonPackageVersion "imagecodecs" "2023.9.18"

# The `tornado` package doesn't have the `__version__` attribute so we can use the `version` attribute.
tornado_version=$(python -c "import tornado; print(tornado.version)")
Expand Down

0 comments on commit bf55a11

Please sign in to comment.