From d10cb82e24dd9ebcbfe56600787ad79cf267394e Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sat, 20 May 2023 15:49:55 +0200
Subject: [PATCH] Synapse : construire image sans buildkit #15

---
 podman-matrix/ci_build-images.sh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/podman-matrix/ci_build-images.sh b/podman-matrix/ci_build-images.sh
index 5ad7659..68d7c93 100755
--- a/podman-matrix/ci_build-images.sh
+++ b/podman-matrix/ci_build-images.sh
@@ -12,16 +12,7 @@ buildfolder=/tmp/synapse-$$
 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:latest
-        podman container run -d --name buildkitd --privileged docker.io/moby/buildkit:latest &&
-        my_buildctl --addr=podman-container://buildkitd build \
-		       --frontend dockerfile.v0 \
-		       --local context=${buildfolder}/ \
-		       --local dockerfile=${buildfolder}/docker/ \
-		       --output type=oci,name="${synapse_image}:${synapse_version}" | \
-                       podman image load &&
-	podman container rm --force buildkitd &&
-	podman image rm docker.io/moby/buildkit:latest
+        podman build -t ${synapse_image}:${synapse_version} -f ${buildfolder}/docker/Dockerfile ${buildfolder}/
     }
     rm -rf ${buildfolder}
 else