From 08dda1014d8c3275d02c7dcec6e83716dc48240f Mon Sep 17 00:00:00 2001
From: sfja <sfja2004@gmail.com>
Date: Mon, 23 Mar 2026 23:23:58 +0100
Subject: [PATCH] use ci-container for everything

---
 .github/workflows/verify.yml                      | 3 ++-
 backend/ci-container/Dockerfile                   | 3 ---
 ci-container/Dockerfile                           | 6 ++++++
 {backend/ci-container => ci-container}/publish.sh | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)
 delete mode 100644 backend/ci-container/Dockerfile
 create mode 100644 ci-container/Dockerfile
 rename {backend/ci-container => ci-container}/publish.sh (84%)

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index cbcc058..116af63 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   backend:
     runs-on: ubuntu-latest
-    container: sfja/h5-mst-ci-backend:1.0
+    container: sfja/h5-mst-ci:1.0
     steps:
     - uses: actions/checkout@v6
     - name: check
@@ -24,6 +24,7 @@ jobs:
 
   game:
     runs-on: ubuntu-latest
+    container: sfja/h5-mst-ci:1.0
     steps:
     - uses: actions/checkout@v6
     - run: sudo apt-get install libsdl3-dev
diff --git a/backend/ci-container/Dockerfile b/backend/ci-container/Dockerfile
deleted file mode 100644
index 83d2595..0000000
--- a/backend/ci-container/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM alpine:edge
-RUN apk add --no-cache build-base clang22-extra-tools
-
diff --git a/ci-container/Dockerfile b/ci-container/Dockerfile
new file mode 100644
index 0000000..fc6a6fa
--- /dev/null
+++ b/ci-container/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine:edge
+RUN apk add --no-cache curl build-base clang22-extra-tools
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
diff --git a/backend/ci-container/publish.sh b/ci-container/publish.sh
similarity index 84%
rename from backend/ci-container/publish.sh
rename to ci-container/publish.sh
index 4f8c769..6fb8bc2 100755
--- a/backend/ci-container/publish.sh
+++ b/ci-container/publish.sh
@@ -8,7 +8,7 @@ if [[ $version == "" ]]; then
     exit 1
 fi
 
-tag=sfja/h5-mst-ci-backend:$version
+tag=sfja/h5-mst-ci:$version
 
 set -xe