Skip to content

Commit

Permalink
Move to debian bookworm
Browse files Browse the repository at this point in the history
Move to debian bookworm

Signed-off-by: Bensuperpc <[email protected]>
  • Loading branch information
bensuperpc committed Sep 30, 2023
1 parent 9eb419c commit 46b2600
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Dockerfile
web-wasm/Dockerfile
*/imagefiles/*
!imagefiles/*
crosstool-ng/*
2 changes: 1 addition & 1 deletion Dockerfile.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DOCKER_IMAGE=debian:bullseye-slim
ARG DOCKER_IMAGE=debian:bookworm-slim
FROM $DOCKER_IMAGE

LABEL maintainer="Matt McCormick [email protected]"
Expand Down
7 changes: 4 additions & 3 deletions imagefiles/install-python-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 46b2600

Please sign in to comment.