diff --git a/src/anaconda/.devcontainer/Dockerfile b/src/anaconda/.devcontainer/Dockerfile index b3dc56f55..7b3305700 100644 --- a/src/anaconda/.devcontainer/Dockerfile +++ b/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 diff --git a/src/anaconda/test-project/test-utils.sh b/src/anaconda/test-project/test-utils.sh index 6d47d2bb8..1186175fb 100644 --- a/src/anaconda/test-project/test-utils.sh +++ b/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 \ diff --git a/src/miniconda/.devcontainer/Dockerfile b/src/miniconda/.devcontainer/Dockerfile index da3314edb..9d65af024 100644 --- a/src/miniconda/.devcontainer/Dockerfile +++ b/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