From ea11b013a2da65d864ccb353f712051a151d1b6e Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sat, 29 Jul 2023 11:08:44 +0200
Subject: [PATCH] privatebin et framadate : build script filename. matrix:
 ajustement buildkit

---
 podman-framadate/.gitlab-ci.yml                              | 2 +-
 podman-framadate/{ci_build_images.sh => ci_build-images.sh}  | 0
 podman-matrix/ci_build-images.sh                             | 2 +-
 podman-privatebin/.gitlab-ci.yml                             | 2 +-
 podman-privatebin/{ci_build_images.sh => ci_build-images.sh} | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename podman-framadate/{ci_build_images.sh => ci_build-images.sh} (100%)
 rename podman-privatebin/{ci_build_images.sh => ci_build-images.sh} (100%)

diff --git a/podman-framadate/.gitlab-ci.yml b/podman-framadate/.gitlab-ci.yml
index 11482db..f1e2f2e 100644
--- a/podman-framadate/.gitlab-ci.yml
+++ b/podman-framadate/.gitlab-ci.yml
@@ -9,7 +9,7 @@ framadate:
   stage: test
   script:
     - cd podman-framadate
-    - ./ci_build_images.sh
+    - ./ci_build-images.sh
     - GARBAYE_FRAMADATE_DOMAIN=sondage.garbaye.fr GARBAYE_FRAMADATE_ADMIN_MAIL=contact-framadate@garbaye.fr GARBAYE_FRAMADATE_ADMIN_PASSWORD=adlkjsqghen GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD=zekjsljgnrxx GARBAYE_FRAMADATE_MYSQL_PASSWORD=azekljqlkcsdql GARBAYE_FRAMADATE_ENV_LISTENPORT=18087 ./05_freshinstall.sh
     - ./20_enable.sh
     - ./30_start.sh && sleep 10
diff --git a/podman-framadate/ci_build_images.sh b/podman-framadate/ci_build-images.sh
similarity index 100%
rename from podman-framadate/ci_build_images.sh
rename to podman-framadate/ci_build-images.sh
diff --git a/podman-matrix/ci_build-images.sh b/podman-matrix/ci_build-images.sh
index 682b002..e36e945 100755
--- a/podman-matrix/ci_build-images.sh
+++ b/podman-matrix/ci_build-images.sh
@@ -17,7 +17,7 @@ if ! podman image exists ${synapse_image}:${synapse_version}; then
     if curl -sSfL -- "https://github.com/matrix-org/synapse/archive/refs/tags/${synapse_version}.tar.gz" | \tar xz --strip-components 1 -C ${buildfolder}/ ; then
         podman image pull docker.io/moby/buildkit:${buildkitd_version}
         podman container run -d --name buildkitd --privileged docker.io/moby/buildkit:${buildkitd_version} ${buildkitd_args} &&
-        sleep 3
+        podman container wait --condition=running buildkitd &&
         my_buildctl --addr=podman-container://buildkitd build \
 		       --frontend dockerfile.v0 \
 		       --local context=${buildfolder}/ \
diff --git a/podman-privatebin/.gitlab-ci.yml b/podman-privatebin/.gitlab-ci.yml
index 93e84f7..c47e431 100644
--- a/podman-privatebin/.gitlab-ci.yml
+++ b/podman-privatebin/.gitlab-ci.yml
@@ -12,7 +12,7 @@ privatebin:
   stage: test
   script:
     - cd podman-privatebin
-    - ./ci_build_images.sh
+    - ./ci_build-images.sh
     - GARBAYE_PRIVATEBIN_ENV_LISTENPORT=18084 ./05_freshinstall.sh
     - ./20_enable.sh
     - ./30_start.sh && sleep 10
diff --git a/podman-privatebin/ci_build_images.sh b/podman-privatebin/ci_build-images.sh
similarity index 100%
rename from podman-privatebin/ci_build_images.sh
rename to podman-privatebin/ci_build-images.sh