From e5616ed8a43c8d7a9ee77e2671eae3d55aec1441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20K=C3=BCffner?= <kueffner.markus@gmail.com>
Date: Sat, 23 Mar 2024 14:09:33 +0100
Subject: [PATCH] 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