Merge pull request #59 from stefanschramm/bookworm

Update example build container to Debian 12
stefanschramm · Jan 11, 2025 · e1fabf0 · e1fabf0
2 parents b4aed1a + 62cde3f
commit e1fabf0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/retroload-lib/examples/Dockerfile b/retroload-lib/examples/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:11
+FROM debian:12
 RUN apt-get update && \
         apt-get -y install --no-install-recommends \
         make \
@@ -8,12 +8,14 @@ RUN apt-get update && \
         ca-certificates \
         python3 \
         python-is-python3 \
+        python3-venv \
         git \
         pip \
         build-essential \
         libsndfile1-dev \
         unzip
-RUN pip install zxtaputils tzxtools
+RUN python3 -m venv /opt/python-venv
+RUN /opt/python-venv/bin/pip install zxtaputils tzxtools
 WORKDIR /opt
 RUN wget https://www.luigidifraia.com/hosted/software/prg2tap-1.8-linux-x86_64-with-examples.tar.gz && \
         tar -zxvf prg2tap-1.8-linux-x86_64-with-examples.tar.gz && \
@@ -44,5 +46,9 @@ RUN wget "https://www.6809.org.uk/asm6809/dl/asm6809-2.12.tar.gz" -O asm6809-2.1
         cd asm6809-2.12 && \
         ./configure && \
         make install
+RUN \
+  ln -s /opt/python-venv/bin/bas2tap /usr/local/bin/bas2tap && \
+  ln -s /opt/python-venv/bin/tapify /usr/local/bin/tapify && \
+  ln -s /opt/python-venv/bin/tzxmerge /usr/local/bin/tzxmerge
 COPY /rebuild_all.sh /
 CMD [ "/rebuild_all.sh" ]
diff --git a/retroload-lib/examples/formats/basicode/Makefile b/retroload-lib/examples/formats/basicode/Makefile
@@ -0,0 +1,4 @@
+all: rl.txt
+
+clean:
+	rm -f *.wav
diff --git a/retroload-lib/examples/formats/c64_data/Makefile b/retroload-lib/examples/formats/c64_data/Makefile
@@ -0,0 +1,4 @@
+all: rl.txt
+
+clean:
+	rm -f *.wav
diff --git a/retroload-lib/examples/formats/kc_basic_generic/Makefile b/retroload-lib/examples/formats/kc_basic_generic/Makefile
@@ -0,0 +1,4 @@
+all: rl.txt
+
+clean:
+	rm -f *.wav
diff --git a/retroload-lib/examples/rebuild_all.sh b/retroload-lib/examples/rebuild_all.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 FORMATS_DIR="$(dirname $(realpath $0))/formats/"
 
 if [ ! -d "$FORMATS_DIR" ] ; then
@@ -9,7 +11,9 @@ if [ ! -d "$FORMATS_DIR" ] ; then
 fi
 
 for FORMAT in "$(dirname $(realpath $0))/formats/"* ; do
+  echo "Processing $FORMAT..."
 	if [ -d "${FORMAT}" ] ; then
 		make -C "${FORMAT}" clean all
 	fi
+  echo
 done