From 3a7c5fcdbbfc6782becebdc2da065dbc1bbdbb90 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 18 May 2024 20:43:58 +0900
Subject: [PATCH] ci: use buildah image directly

---
 .gitlab-ci.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3fb0497d5..608a81c6df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ test:build:client_only:
 
 build:container:
   stage: build
-  image: docker.io/debian:bookworm-slim
+  image: quay.io/buildah/stable:latest
   services: []
   rules:
     - if: $BUILD == 'false'
@@ -181,11 +181,10 @@ build:container:
       optional: true
     - job: test:build:client_only
       optional: true
+  variables:
+    STORAGE_DRIVER: vfs
   before_script:
-    - apt-get update && apt-get -y upgrade
-    - apt-get install -y --no-install-recommends ca-certificates fuse-overlayfs
-    - echo 'deb https://deb.debian.org/debian trixie main' | tee /etc/apt/sources.list
-    - apt-get update && apt-get install -y --no-install-recommends --target-release trixie buildah
+    - buildah version
     - buildah prune --all --force || true
     - echo "${CI_REGISTRY_PASSWORD}" | buildah login --username "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
     - export IMAGE_TAG="${CI_REGISTRY}/${CI_PROJECT_PATH}/develop:not-for-production"
@@ -193,11 +192,6 @@ build:container:
   script:
     - |-
       buildah build \
-        --isolation chroot \
-        --device /dev/fuse:rw \
-        --security-opt seccomp=unconfined \
-        --security-opt apparmor=unconfined \
-        --cap-add all \
         --platform linux/amd64 \
         --layers \
         --cache-to "${IMAGE_CACHE}" \