From cf13d8c00843a713b6a345deaea23c89af12f94d Mon Sep 17 00:00:00 2001
From: Dusty Daemon <dustinpaystaxes@gmail.com>
Date: Fri, 10 Nov 2023 15:55:52 -0500
Subject: [PATCH 1/2] make: always generate proto files sans rust
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Generating the msggen proto files doesn’t require rust (even though it generates rust files).

Changelog-None
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e6da7a1b8d10..cef3b5a2aae1 100644
--- a/Makefile
+++ b/Makefile
@@ -366,7 +366,8 @@ ifneq ($(FUZZING),0)
 endif
 ifneq ($(RUST),0)
 	include cln-rpc/Makefile
-	include cln-grpc/Makefile
+endif
+include cln-grpc/Makefile
 
 $(MSGGEN_GENALL)&: doc/schemas/*.request.json doc/schemas/*.schema.json
 	PYTHONPATH=contrib/msggen $(PYTHON) contrib/msggen/msggen/__main__.py
@@ -389,7 +390,6 @@ $(GRPC_GEN)&: cln-grpc/proto/node.proto cln-grpc/proto/primitives.proto
 	$(PYTHON) -m grpc_tools.protoc -I cln-grpc/proto cln-grpc/proto/primitives.proto --python_out=$(GRPC_PATH)/ --experimental_allow_proto3_optional
 	find $(GRPC_DIR)/ -type f -name "*.py" -print0 | xargs -0 sed -i'.bak' -e 's/^import \(.*\)_pb2 as .*__pb2/from pyln.grpc import \1_pb2 as \1__pb2/g'
 	find $(GRPC_DIR)/ -type f -name "*.py.bak" -print0 | xargs -0 rm -f
-endif
 
 # We make pretty much everything depend on these.
 ALL_GEN_HEADERS := $(filter %gen.h,$(ALL_C_HEADERS))

From 43937aa73ffc5276b4f5fba54cfccf34916161f0 Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Mon, 5 Feb 2024 11:13:33 +0100
Subject: [PATCH 2/2] ci: Install python build dependencies in alpine image

---
 contrib/docker/Dockerfile.alpine | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/docker/Dockerfile.alpine b/contrib/docker/Dockerfile.alpine
index ddae6b2a1c37..c1605c1de16c 100644
--- a/contrib/docker/Dockerfile.alpine
+++ b/contrib/docker/Dockerfile.alpine
@@ -16,7 +16,8 @@ RUN apk update && \
       libtool \
       net-tools \
       postgresql-dev \
-      py3-mako \
+      linux-headers \
+      py3-pip \
       python3 \
       python3-dev \
       sqlite-dev \
@@ -29,6 +30,9 @@ COPY . /source
 
 RUN git clone /source /repo --recursive && \
     cd /repo && \
+    python3 -m pip install poetry && \
+    poetry export --without-hashes --with=dev > requirements.txt && \
+    python3 -m pip install -r requirements.txt --ignore-installed --force && \
     ./configure --enable-static --prefix=/usr && \
     make -j $(nproc) && \
     make install