diff --git a/src/anaconda/.devcontainer/Dockerfile b/src/anaconda/.devcontainer/Dockerfile index 6a9ba7eb6..4a569b5ee 100644 --- a/src/anaconda/.devcontainer/Dockerfile +++ b/src/anaconda/.devcontainer/Dockerfile @@ -43,10 +43,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && echo "conda activate base" >> ~/.bashrc \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/add-notice.sh -# Since anaconda distribution 2023.03-1, continuumio/anaconda3 image no more contains `anaconda` pkg. -RUN conda update -n base -c defaults conda \ - && conda install --yes anaconda - # Temporary: Upgrade python packages due to mentioned CVEs # They are installed by the base image (continuumio/anaconda3) which does not have the patch. RUN python3 -m pip install \ diff --git a/src/anaconda/manifest.json b/src/anaconda/manifest.json index 2ac91e5e6..c705dd380 100644 --- a/src/anaconda/manifest.json +++ b/src/anaconda/manifest.json @@ -44,11 +44,6 @@ "conda": { "cgIgnore": true, "path": "/opt/conda" - }, - "anaconda": { - "cgIgnore": true, - "path": "/opt/conda", - "versionCommand": "conda list anaconda$ | grep -oP 'anaconda\\s+\\K[^\\s]+'" } }, "languages": { diff --git a/src/anaconda/test-project/test.sh b/src/anaconda/test-project/test.sh index 5ca0f7945..f77f0248b 100755 --- a/src/anaconda/test-project/test.sh +++ b/src/anaconda/test-project/test.sh @@ -8,7 +8,6 @@ checkCommon # Image specific tests check "conda" conda --version -check "anaconda" bash -c "conda list anaconda$ | grep -oP 'anaconda\\s+\\K[^\\s]+'" check "python" python --version check "pylint" pylint --version check "flake8" flake8 --version @@ -43,8 +42,7 @@ checkPythonPackageVersion "werkzeug" "2.2.3" checkPythonPackageVersion "certifi" "2022.12.07" checkPythonPackageVersion "requests" "2.31.0" -# https://github.com/conda/conda/issues/8149 -check "conda-update-conda" bash -c "conda update --force conda" +check "conda-update-conda" bash -c "conda update -y conda" check "conda-install" bash -c "conda install -c conda-forge --yes tensorflow" check "conda-install" bash -c "conda install -c conda-forge --yes pytorch"