From b3af292266bc0e15626ef6ebd4d3d0b2af3f3b03 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Fri, 12 Aug 2022 20:34:42 +0200
Subject: [PATCH] Synapse : image to gitea?

---
 podman-matrix/.gitlab-ci.yml                             | 1 +
 podman-matrix/05_freshinstall.sh                         | 2 +-
 podman-matrix/10_install.sh                              | 3 ++-
 podman-matrix/{zz_build-images.sh => ci_build-images.sh} | 6 +++++-
 podman-matrix/vars.sh                                    | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)
 rename podman-matrix/{zz_build-images.sh => ci_build-images.sh} (87%)

diff --git a/podman-matrix/.gitlab-ci.yml b/podman-matrix/.gitlab-ci.yml
index 0384434..f583fcb 100644
--- a/podman-matrix/.gitlab-ci.yml
+++ b/podman-matrix/.gitlab-ci.yml
@@ -11,6 +11,7 @@ matrix:
   stage: test
   script:
     - cd podman-matrix
+    - ./ci_build-images.sh
     - GARBAYE_MATRIX_POSTGRES_PASSWORD=WHATEVERCIDBPASSWORD  GARBAYE_MATRIX_ENV_LISTENPORT=18086 ./05_freshinstall.sh
     - ./20_enable.sh
     - ./30_start.sh && sleep 10
diff --git a/podman-matrix/05_freshinstall.sh b/podman-matrix/05_freshinstall.sh
index a80af42..a97a642 100755
--- a/podman-matrix/05_freshinstall.sh
+++ b/podman-matrix/05_freshinstall.sh
@@ -15,7 +15,7 @@ if podman volume exists ${confvolume} || podman volume exists ${dbvolume}; then
 	exit 1
 fi
 
-source ${ABSDIR}/zz_build-images.sh &&
+podman image pull ${synapse_image}:${synapse_version} &&
 podman image exists ${synapse_image}:${synapse_version} &&
 podman volume create ${confvolume} &&
 podman volume create ${dbvolume} &&
diff --git a/podman-matrix/10_install.sh b/podman-matrix/10_install.sh
index 2e91c97..3d9ad22 100755
--- a/podman-matrix/10_install.sh
+++ b/podman-matrix/10_install.sh
@@ -20,7 +20,8 @@ if ! podman volume exists ${dbvolume} ; then
     exit 1
 fi
 
-source ${ABSDIR}/zz_build-images.sh &&
+podman image pull ${synapse_image}:${synapse_version} &&
+podman image exists ${synapse_image}:${synapse_version} &&
 podman pull ${postgres_image}:${postgres_version} &&
 podman pod create --publish ${listen_if}:${listen_port}:8008 --name ${pod_name} &&
 podman run -d --name ${db_container_name} --pod ${pod_name} \
diff --git a/podman-matrix/zz_build-images.sh b/podman-matrix/ci_build-images.sh
similarity index 87%
rename from podman-matrix/zz_build-images.sh
rename to podman-matrix/ci_build-images.sh
index f01f981..735767b 100755
--- a/podman-matrix/zz_build-images.sh
+++ b/podman-matrix/ci_build-images.sh
@@ -23,4 +23,8 @@ if ! podman image exists ${synapse_image}:${synapse_version}; then
 	podman rmi docker.io/moby/buildkit:latest
     }
     rm -rf ${buildfolder}
-fi
+else
+    echo "Image ${synapse_image}:${synapse_version} already built"
+fi &&
+
+oci_push_to_registry ${synapse_image}:${synapse_version}
diff --git a/podman-matrix/vars.sh b/podman-matrix/vars.sh
index b6aa143..d4c12c0 100644
--- a/podman-matrix/vars.sh
+++ b/podman-matrix/vars.sh
@@ -3,7 +3,7 @@
 pod_name='podman-matrix'
 service_name="pod-${pod_name}.service"
 #version='latest'
-synapse_image="localhost/matrixdotorg/synapse"
+synapse_image="git.garbaye.fr/garbaye/matrixdotorg-synapse"
 synapse_version='v1.63.1'
 postgres_image="docker.io/library/postgres"
 postgres_version='11.14'