From 7f48f4b300aac8b55e6afd0c85c2558feea8b295 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Wed, 26 Jul 2023 23:05:49 +0200
Subject: [PATCH] matrix/synapse: fix buildkitd options. Fixes #16

---
 podman-matrix/ci_build-images.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/podman-matrix/ci_build-images.sh b/podman-matrix/ci_build-images.sh
index ffde53b..bfad384 100755
--- a/podman-matrix/ci_build-images.sh
+++ b/podman-matrix/ci_build-images.sh
@@ -9,13 +9,15 @@ ensure_not_root
 
 buildfolder=/tmp/synapse-$$
 
-buildkitd_version='v0.11.6' # latest v0.12.0 is broken
+buildkitd_version='latest'
+buildkitd_args='--oci-worker-snapshotter=native' # needed as of v0.12.0
 
 if ! podman image exists ${synapse_image}:${synapse_version}; then
     mkdir ${buildfolder} &&
     curl -sSfL -- "https://github.com/matrix-org/synapse/archive/refs/tags/${synapse_version}.tar.gz" | \tar xz --strip-components 1 -C ${buildfolder}/ && {
         podman image pull docker.io/moby/buildkit:${buildkitd_version}
-        podman container run -d --name buildkitd --privileged docker.io/moby/buildkit:${buildkitd_version} &&
+        podman container run -d --name buildkitd --privileged docker.io/moby/buildkit:${buildkitd_version} ${buildkitd_args} &&
+        sleep 3
         my_buildctl --addr=podman-container://buildkitd build \
 		       --frontend dockerfile.v0 \
 		       --local context=${buildfolder}/ \