Fix accidental double ampersand

.gitea/workflows/release.yaml

@@ -35,7 +35,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and push default 22.04
+      - name: Build and push default 24.04
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -45,11 +45,11 @@ jobs:
           push: true
           no-cache: true
           build-args: |
-            BASE_IMAGE_TAG=ubuntu-22.04
+            BASE_IMAGE_TAG=ubuntu-24.04
             IMAGE_VERSION=${{ steps.meta.outputs.IMAGE_VERSION }}
             IMAGE_CREATED=${{ steps.meta.outputs.IMAGE_CREATED }}
             IMAGE_REVISION=${{ steps.meta.outputs.IMAGE_REVISION }}
           tags: |
-            seeseemelk/runner-images:ubuntu-22.04
+            seeseemelk/runner-images:ubuntu-24.04
-            seeseemelk/runner-images:ubuntu-22.04-${{ steps.meta.outputs.IMAGE_VERSION }}
+            seeseemelk/runner-images:ubuntu-24.04-${{ steps.meta.outputs.IMAGE_VERSION }}
             seeseemelk/runner-images:ubuntu-latest

Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE_TAG=ubuntu-22.04
+ARG BASE_IMAGE_TAG=ubuntu-24.04
 
 FROM gitea/runner-images:${BASE_IMAGE_TAG}
 
@@ -18,22 +18,22 @@ LABEL org.opencontainers.image.created="${IMAGE_CREATED}" \
 	org.opencontainers.image.title="Gitea Actions runner images customised by Seeseemelk" \
 	org.opencontainers.image.description="Docker images used by act_runner to run workflows."
 
-RUN apt-get update && \
+RUN wget -O sonar.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-7.1.0.4889.zip && \
-	apt-get -y install gnupg2 openjdk-21-jre-headless
-
-RUN wget -O sonar.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.1.0.4477.zip && \
 	unzip sonar.zip && \
 	mkdir /sonar && \
 	mv sonar-scanner-*/* /sonar && \
 	rm -r sonar-scanner-* sonar.zip
+ENV PATH="$PATH:/sonar/bin"
 
-RUN pip3 install makelove
+RUN apt-get update && \
-
+	apt-get -y install \
-RUN apt-get -y install luarocks && \
+		gnupg2 openjdk-21-jre-headless \
+		luarocks \
+		cmake \
+		libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev \
+		qemu-user qemu-user-binfmt \
+		golang-1.23 && \
+	pip3 install --break-system-packages makelove && \
 	luarocks install tl
 
-RUN apt-get -y install \
+ENV PATH="/usr/lib/go-1.23/bin/:$PATH"
-	cmake \
-	libsdl2-dev libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-
-ENV PATH="$PATH:/sonar/bin"

README.md

@@ -0,0 +1,12 @@
+# Runner Images
+This contains the docker runner image used by the Gitea Action runner.
+
+## Updating the runner
+The runner will run from a cached version of the image.
+In order to use the new version, one has to obtain a shell in the runner container, and pull the image again.
+
+```sh
+ssh pi
+docker exec -it homeserver-gitea-runner-1 /bin/sh
+docker pull seeseemelk/runner-images:ubuntu-latest
+```

test.sh

@@ -1,3 +1,4 @@
+set -e
 docker build -t runnerimage .
 docker run -it --rm runnerimage
 docker image rm runnerimage