From dd58f4d4e94ad6d4f309e46ae0bdd6caee58cd71 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 17:10:54 +0000 Subject: [PATCH 1/4] chore(deps): update python docker tag to v3.12 --- docker/klipper/Dockerfile | 4 ++-- docker/klipperscreen/Dockerfile | 4 ++-- docker/moonraker/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile index 2ef6359..31e5793 100644 --- a/docker/klipper/Dockerfile +++ b/docker/klipper/Dockerfile @@ -1,6 +1,6 @@ ## Get Klipper Source and Build venv ## -FROM python:3.11-bookworm as build +FROM python:3.12-bookworm as build ARG REPO=https://github.com/Klipper3d/klipper ARG VERSION=master @@ -22,7 +22,7 @@ RUN python -m venv venv \ ## Klippy Runtime Image ## -FROM python:3.11-slim-bookworm as run +FROM python:3.12-slim-bookworm as run WORKDIR /opt RUN groupadd klipper --gid 1000 \ diff --git a/docker/klipperscreen/Dockerfile b/docker/klipperscreen/Dockerfile index fba5b2d..db6e1ff 100644 --- a/docker/klipperscreen/Dockerfile +++ b/docker/klipperscreen/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-bookworm as build +FROM python:3.12-bookworm as build ARG REPO=https://github.com/KlipperScreen/KlipperScreen ARG VERSION=master @@ -18,7 +18,7 @@ RUN git clone ${REPO} klipperscreen \ RUN python -m venv venv \ && venv/bin/pip install -r klipperscreen/scripts/KlipperScreen-requirements.txt -FROM python:3.11-slim-bookworm as run +FROM python:3.12-slim-bookworm as run RUN apt update \ && apt install -y \ diff --git a/docker/moonraker/Dockerfile b/docker/moonraker/Dockerfile index 5b58a84..8853e7d 100644 --- a/docker/moonraker/Dockerfile +++ b/docker/moonraker/Dockerfile @@ -1,5 +1,5 @@ ## Get Code and Build venv -FROM python:3.11-bookworm as build +FROM python:3.12-bookworm as build ARG REPO=https://github.com/Arksine/moonraker ARG VERSION=master @@ -15,7 +15,7 @@ RUN python -m venv venv \ && venv/bin/pip install -r moonraker/scripts/moonraker-requirements.txt ## Runtime Image -FROM python:3.11-slim-bookworm as run +FROM python:3.12-slim-bookworm as run RUN apt update \ && apt install -y \ From f6f16be8fb3685b8e9b5f70164cb0cdc1db41b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20K=C3=BCffner?= Date: Sun, 10 Mar 2024 01:47:17 +0100 Subject: [PATCH 2/4] klipper: update numpy for python 3.12 --- docker/klipper/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile index 31e5793..d8f337f 100644 --- a/docker/klipper/Dockerfile +++ b/docker/klipper/Dockerfile @@ -14,7 +14,7 @@ RUN git clone ${REPO} klipper \ RUN python -m venv venv \ && venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \ - && venv/bin/pip install numpy==1.25.2 \ + && venv/bin/pip install numpy==1.26.4 \ && venv/bin/python -m compileall klipper/klippy \ && venv/bin/python klipper/klippy/chelper/__init__.py ### From e5616ed8a43c8d7a9ee77e2671eae3d55aec1441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20K=C3=BCffner?= Date: Sat, 23 Mar 2024 14:09:33 +0100 Subject: [PATCH 3/4] klipper: restructure build stage and add requirements --- docker/klipper/Dockerfile | 16 +++++++++++----- docker/klipper/additional_requirements.txt | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 docker/klipper/additional_requirements.txt diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile index d8f337f..cf9724f 100644 --- a/docker/klipper/Dockerfile +++ b/docker/klipper/Dockerfile @@ -2,19 +2,25 @@ ## FROM python:3.12-bookworm as build -ARG REPO=https://github.com/Klipper3d/klipper -ARG VERSION=master +RUN apt update \ + && apt install -y cmake \ + && apt clean WORKDIR /opt +COPY additional_requirements.txt . + +RUN python -m venv venv \ + && venv/bin/pip install -r additional_requirements.txt + +ARG REPO=https://github.com/Klipper3d/klipper +ARG VERSION=master RUN git clone ${REPO} klipper \ && cd klipper \ && git checkout ${VERSION} \ && rm -rf .git -RUN python -m venv venv \ - && venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \ - && venv/bin/pip install numpy==1.26.4 \ +RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \ && venv/bin/python -m compileall klipper/klippy \ && venv/bin/python klipper/klippy/chelper/__init__.py ### diff --git a/docker/klipper/additional_requirements.txt b/docker/klipper/additional_requirements.txt new file mode 100644 index 0000000..fd0ebc7 --- /dev/null +++ b/docker/klipper/additional_requirements.txt @@ -0,0 +1,2 @@ +#cmake==3.28.4; platform.machine == 'armv7l' +numpy==1.26.4 \ No newline at end of file From ddd5ba5a5e7e2b6aeb9f23ae78ac3faa5cb88023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20K=C3=BCffner?= Date: Sat, 23 Mar 2024 15:49:32 +0100 Subject: [PATCH 4/4] klipper: rename additional requirements --- docker/klipper/Dockerfile | 4 ++-- docker/klipper/additional_requirements.txt | 2 -- docker/klipper/requirements-prind.txt | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 docker/klipper/additional_requirements.txt create mode 100644 docker/klipper/requirements-prind.txt diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile index cf9724f..8198e6e 100644 --- a/docker/klipper/Dockerfile +++ b/docker/klipper/Dockerfile @@ -7,10 +7,10 @@ RUN apt update \ && apt clean WORKDIR /opt -COPY additional_requirements.txt . +COPY requirements-prind.txt . RUN python -m venv venv \ - && venv/bin/pip install -r additional_requirements.txt + && venv/bin/pip install -r requirements-prind.txt ARG REPO=https://github.com/Klipper3d/klipper ARG VERSION=master diff --git a/docker/klipper/additional_requirements.txt b/docker/klipper/additional_requirements.txt deleted file mode 100644 index fd0ebc7..0000000 --- a/docker/klipper/additional_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -#cmake==3.28.4; platform.machine == 'armv7l' -numpy==1.26.4 \ No newline at end of file diff --git a/docker/klipper/requirements-prind.txt b/docker/klipper/requirements-prind.txt new file mode 100644 index 0000000..74603ff --- /dev/null +++ b/docker/klipper/requirements-prind.txt @@ -0,0 +1 @@ +numpy==1.26.4 \ No newline at end of file