From 49171320c0eb9e0b84599b8703c61717bb5f9281 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Sun, 14 Aug 2022 14:17:34 +0200 Subject: [PATCH] Seafile : migrate to gitea registry : first try? --- podman-seafile/.gitlab-ci.yml | 1 + podman-seafile/10_install.sh | 2 +- podman-seafile/README.md | 1 - podman-seafile/{zz_build-images.sh => ci_build-images.sh} | 4 ++++ podman-seafile/vars.sh | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) rename podman-seafile/{zz_build-images.sh => ci_build-images.sh} (87%) diff --git a/podman-seafile/.gitlab-ci.yml b/podman-seafile/.gitlab-ci.yml index 812c044..6e19fd3 100644 --- a/podman-seafile/.gitlab-ci.yml +++ b/podman-seafile/.gitlab-ci.yml @@ -8,6 +8,7 @@ seafile: stage: test script: - cd podman-seafile + - ./ci_build-images.sh - GARBAYE_SEAFILE_MYSQL_ROOT_PASSWORD=ecruebdfklj GARBAYE_SEAFILE_ENV_LISTENPORT=18082 ./05_freshinstall.sh - ./20_enable.sh - ./30_start.sh && sleep 10 diff --git a/podman-seafile/10_install.sh b/podman-seafile/10_install.sh index 1c95f65..bce9f68 100755 --- a/podman-seafile/10_install.sh +++ b/podman-seafile/10_install.sh @@ -35,7 +35,7 @@ export memcached_release export listen_if export listen_port -source ${ABSDIR}/zz_build-images.sh +podman image pull ${seafile_image}:${seafile_release} && podman image exists ${seafile_image}:${seafile_release} && podman pull docker.io/library/memcached:${memcached_release} && podman pull docker.io/library/mariadb:${mariadb_release} && diff --git a/podman-seafile/README.md b/podman-seafile/README.md index 101a549..dca6a73 100644 --- a/podman-seafile/README.md +++ b/podman-seafile/README.md @@ -16,7 +16,6 @@ Modifier la version cible dans `vars.sh` (ici pour l'exemple : `8.0.8`) ``` cd /opt/services-garbaye/podman-seafile export GARBAYE_SEAFILE_MYSQL_ROOT_PASSWORD=XXXXXXXXXXXXXXXX -./zz_build-images.sh ./40_stop.sh ./70_disable.sh ./80_destroy.sh diff --git a/podman-seafile/zz_build-images.sh b/podman-seafile/ci_build-images.sh similarity index 87% rename from podman-seafile/zz_build-images.sh rename to podman-seafile/ci_build-images.sh index f4f4c70..840d3a3 100755 --- a/podman-seafile/zz_build-images.sh +++ b/podman-seafile/ci_build-images.sh @@ -20,4 +20,8 @@ if ! podman image exists ${seafile_image}:${seafile_release}; then ${buildfolder}/image/seafile_9.0 && podman rmi phusion/baseimage:focal-1.0.0 rm -rf ${buildfolder} +else + echo "Image ${seafile_image}:${seafile_release} already built" fi + +oci_push_to_registry ${seafile_image}:${seafile_release} diff --git a/podman-seafile/vars.sh b/podman-seafile/vars.sh index 0e5a8c0..a0c6bf0 100644 --- a/podman-seafile/vars.sh +++ b/podman-seafile/vars.sh @@ -4,7 +4,7 @@ pod_name='podman-seafile' service_name="pod-${pod_name}.service" mariadb_release='10.5' memcached_release='1.6' -seafile_image='localhost/seafileltd/seafile-mc' +seafile_image='git.garbaye.fr/garbaye/seafile-mc' seafile_release='9.0.6' dbvolume='podman-seafile_seafile-db' datavolume='podman-seafile_seafile-data'