diff --git a/podman-gitea/.gitlab-ci.yml b/podman-gitea/.gitlab-ci.yml index 2cb6936..e5dda4f 100644 --- a/podman-gitea/.gitlab-ci.yml +++ b/podman-gitea/.gitlab-ci.yml @@ -9,6 +9,7 @@ gitea: stage: test script: - cd podman-gitea + - ./ci_build-images.sh - GARBAYE_GITEA_POSTGRES_PASSWORD=kejfczEAKjzkejklc GARBAYE_GITEA_ENV_WEBLISTENPORT=18088 GARBAYE_GITEA_ENV_SSHLISTENPORT=12222 ./05_freshinstall.sh - ./20_enable.sh - ./30_start.sh && sleep 10 diff --git a/podman-gitea/10_install.sh b/podman-gitea/10_install.sh index fb43ae8..06e93b4 100755 --- a/podman-gitea/10_install.sh +++ b/podman-gitea/10_install.sh @@ -50,7 +50,7 @@ export weblisten_port export sshlisten_if export sshlisten_port -source ${ABSDIR}/zz_build-images.sh +podman image pull ${gitea_image}:${gitea_version} && podman image exists ${gitea_image}:${gitea_version} && podman pull ${postgres_image}:${postgres_version} && # force refresh of app.ini diff --git a/podman-gitea/zz_build-images.sh b/podman-gitea/ci_build-images.sh similarity index 89% rename from podman-gitea/zz_build-images.sh rename to podman-gitea/ci_build-images.sh index b997ce0..502a3ce 100755 --- a/podman-gitea/zz_build-images.sh +++ b/podman-gitea/ci_build-images.sh @@ -21,4 +21,8 @@ if ! podman image exists ${gitea_image}:${gitea_version}; then podman image prune -a -f --filter intermediate=true podman image rm -f $(podman images -a -q -- docker.io/library/golang) podman image rm -f $(podman images -a -q -- docker.io/library/alpine) +else + echo "Image ${gitea_image}:${gitea_version} already built" fi + +oci_push_to_registry ${gitea_image}:${gitea_version} diff --git a/podman-gitea/vars.sh b/podman-gitea/vars.sh index 8f725f2..0f6ef47 100644 --- a/podman-gitea/vars.sh +++ b/podman-gitea/vars.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash ## vars -gitea_image="localhost/gitea/gitea" +gitea_image="git.garbaye.fr/garbaye/gitea" gitea_version='1.17.0' postgres_image="docker.io/library/postgres" postgres_version='14'