[Anaconda] - Add support for bookworm (devcontainers#1110)

* [Anaconda] - Add support for bookworm

* "future" pkg removed from upstream image

Author: samruddhikhandale

src/anaconda/.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 FROM continuumio/anaconda3 as upstream
 
 # Verify OS version is expected one
-RUN . /etc/os-release && if [ "${VERSION_CODENAME}" != "bullseye" ]; then exit 1; fi
+RUN . /etc/os-release && if [ "${VERSION_CODENAME}" != "bookworm" ]; then exit 1; fi
 
 # Temporary: Upgrade python packages due to mentioned CVEs
 # They are installed by the base image (continuumio/anaconda3) which does not have the patch.
@@ -10,7 +10,7 @@ RUN chmod +x /tmp/apply_security_patches.sh
 RUN /tmp/apply_security_patches.sh
 
 # Reset and copy updated files with updated privs to keep image size down
-FROM mcr.microsoft.com/devcontainers/base:1-bullseye
+FROM mcr.microsoft.com/devcontainers/base:1-bookworm
 
 ARG USERNAME=vscode
 

src/anaconda/manifest.json

@@ -31,7 +31,6 @@
 			"numpy",
 			"certifi",
 			"setuptools",
-			"future",
 			"wheel",
 			"nbconvert",
 			"py",

src/anaconda/test-project/test-utils.sh

@@ -125,7 +125,7 @@ checkCommon()
         libc6 \
         libgcc1 \
         libgssapi-krb5-2 \
-        liblttng-ust0 \
+        liblttng-ust1 \
         libstdc++6 \
         zlib1g \
         locales \

src/anaconda/test-project/test.sh

@@ -34,7 +34,6 @@ checkPythonPackageVersion "cookiecutter" "2.1.1"
 checkPythonPackageVersion "mistune" "2.0.3"
 checkPythonPackageVersion "numpy" "1.22"
 checkPythonPackageVersion "setuptools" "65.5.1"
-checkPythonPackageVersion "future" "0.18.3"
 checkPythonPackageVersion "wheel" "0.38.1"
 checkPythonPackageVersion "nbconvert" "6.5.1"
 checkPythonPackageVersion "werkzeug" "3.0.3"

src/miniconda/.devcontainer/Dockerfile

@@ -1,5 +1,8 @@
 FROM continuumio/miniconda3 as upstream
 
+# Verify OS version is expected one
+RUN . /etc/os-release && if [ "${VERSION_CODENAME}" != "bookworm" ]; then exit 1; fi
+
 # Temporary: Upgrade python packages
 COPY ./apply_security_patches.sh /tmp/apply_security_patches.sh
 RUN chmod +x /tmp/apply_security_patches.sh