From f4e2a2211b9919af2931b3030a35e06918b24655 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sun, 25 Jan 2026 16:42:07 +0200
Subject: [PATCH] Fixing testing

---
 Dockerfile      | 26 ++++++++++++++++++++++++++
 Dockerfile.test | 44 ++++++++++++++++++--------------------------
 Makefile        |  8 +++-----
 3 files changed, 47 insertions(+), 31 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..113b404
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,26 @@
+ARG SCHEME=chibi
+FROM debian:bookworm-slim
+RUN apt-get update && apt-get install -y \
+    build-essential git wget ca-certificates guile-3.0 guile-3.0-dev libcurl4
+ENV CONFIG=--prefix=/root/.local
+WORKDIR /build
+RUN wget https://gitlab.com/-/project/6808260/uploads/819fd1f988c6af5e7df0dfa70aa3d3fe/akku-1.1.0.tar.gz && tar -xf akku-1.1.0.tar.gz && mv akku-1.1.0 akku
+WORKDIR /build/akku
+ENV PATH=/root/.local/bin:${PATH}
+RUN ./configure ${CONFIG}
+RUN make
+RUN make install
+WORKDIR /build
+RUN wget https://ftp.gnu.org/gnu/make/make-4.4.tar.gz && tar -xf make-4.4.tar.gz
+WORKDIR /build/make-4.4
+RUN ./configure ${CONFIG}
+RUN make
+run make install
+WORKDIR /build
+RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
+WORKDIR /build/chibi-scheme
+RUN make PREFIX=/root/.local
+RUN make PREFIX=/root/.local install
+WORKDIR /workdir
+COPY scheme-venv /root/.local/bin/scheme-venv
+
diff --git a/Dockerfile.test b/Dockerfile.test
index 30c78c0..0b471e4 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,34 +1,26 @@
-ARG SCHEME=chibi
-FROM docker.io/debian:trixie AS build
-RUN apt-get update && apt-get install -y \
-    build-essential git ca-certificates wget
-WORKDIR /build
-RUN wget https://gitlab.com/-/project/6808260/uploads/094ce726ce3c6cf8c14560f1e31aaea0/akku-1.1.0.amd64-linux.tar.xz && tar -xf akku-1.1.0.amd64-linux.tar.xz
-WORKDIR /build/akku-1.1.0.amd64-linux
-RUN ./install.sh
-WORKDIR /build
-RUN wget https://ftp.gnu.org/gnu/make/make-4.4.tar.gz && tar -xf make-4.4.tar.gz
-WORKDIR /build/make-4.4
-ENV PATH=/root/.local:${PATH}
-RUN ./configure --prefix=/root/.local
-RUN make
-run make install
-WORKDIR /build
-RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-WORKDIR /build/chibi-scheme
-RUN make PREFIX=/root/.local
-RUN make PREFIX=/root/.local install
-RUN apt-get install -y plocate libcurl3t64-gnutls
-RUN cp /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.3 /root/.local/lib/libcurl.so.3
-RUN cp -r /usr/lib/x86_64-linux-gnu/* /root/.local/lib/
-
 ARG SCHEME=chibi
 FROM docker.io/schemers/${SCHEME}:head
-COPY --from=build /root/.local /root/.local
+RUN apt-get update && apt-get install -y \
+    build-essential git wget ca-certificates guile-3.0 guile-3.0-dev libcurl4 \
+    xz-utils
+
+WORKDIR /build
+RUN wget https://gitlab.com/-/project/6808260/uploads/094ce726ce3c6cf8c14560f1e31aaea0/akku-1.1.0.amd64-linux.tar.xz && tar -xf akku-1.1.0.amd64-linux.tar.xz
+RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
+
+WORKDIR /build/akku-1.1.0.amd64-linux
+RUN ./install.sh
+
+WORKDIR /build/chibi-scheme
+RUN make
+RUN make install
+
+WORKDIR /workdir
+RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
 ENV PATH=/root/.local/bin:${PATH}
 ENV LD_LIBRARY_PATH=/root/.local/lib
-WORKDIR /workdir
 COPY Makefile Makefile
 COPY test.scm test.scm
 COPY scheme-venv scheme-venv
 
+
diff --git a/Makefile b/Makefile
index 1845702..b1dcc9b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,9 @@ test:
 		&& ./testvenv/bin/akku install akku-r7rs \
 		&& ./testvenv/bin/scheme-script test.scm
 
-build-docker-test-image:
-	docker build --build-arg SCHEME=${SCHEME} -f Dockerfile.test --tag=scheme-venv-test .
-
-test-docker: build-docker-test-image
-	docker run -t scheme-venv-test bash -c "make SCHEME=${SCHEME} RNRS=${RNRS} test"
+test-docker:
+	docker build --build-arg SCHEME=${SCHEME} -f Dockerfile.test --tag=scheme-venv-test-${SCHEME} .
+	docker run -t scheme-venv-test-${SCHEME} bash -c "make SCHEME=${SCHEME} RNRS=${RNRS} test"
 
 install:
 	mkdir -p ${PREFIX}/bin