From 46b2600a3fc3111be0bdfba949c72f68e4762ec7 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sat, 30 Sep 2023 14:25:32 +0200 Subject: [PATCH] Move to debian bookworm Move to debian bookworm Signed-off-by: Bensuperpc --- .gitignore | 1 + Dockerfile.in | 2 +- imagefiles/install-python-packages.sh | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4c0fc20a..64b7b65a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Dockerfile web-wasm/Dockerfile */imagefiles/* !imagefiles/* +crosstool-ng/* diff --git a/Dockerfile.in b/Dockerfile.in index c9b082cd..ce697cb4 100644 --- a/Dockerfile.in +++ b/Dockerfile.in @@ -1,4 +1,4 @@ -ARG DOCKER_IMAGE=debian:bullseye-slim +ARG DOCKER_IMAGE=debian:bookworm-slim FROM $DOCKER_IMAGE LABEL maintainer="Matt McCormick matt.mccormick@kitware.com" diff --git a/imagefiles/install-python-packages.sh b/imagefiles/install-python-packages.sh index 964e5edc..2356015c 100755 --- a/imagefiles/install-python-packages.sh +++ b/imagefiles/install-python-packages.sh @@ -23,10 +23,11 @@ cd /tmp curl -# -LO https://bootstrap.pypa.io/pip/get-pip.py # https://github.com/pypa/setuptools/issues/2993 export SETUPTOOLS_USE_DISTUTILS=stdlib -${PYTHON} get-pip.py --ignore-installed +# Add --break-system-packages to fix change since python 3.11: https://stackoverflow.com/a/75722775/10152334 +${PYTHON} get-pip.py --ignore-installed --break-system-packages rm get-pip.py -${PYTHON} -m pip install --upgrade --ignore-installed setuptools -${PYTHON} -m pip install --ignore-installed conan meson +${PYTHON} -m pip install --break-system-packages --upgrade --ignore-installed setuptools +${PYTHON} -m pip install --break-system-packages --ignore-installed conan meson # Purge cache to save space: https://stackoverflow.com/questions/37513597/is-it-safe-to-delete-cache-pip-directory ${PYTHON} -m pip cache purge