From 83062903f4fb3b5e9eb3ee8c09027e1593edc299 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 16 Dec 2022 20:48:24 +0100 Subject: [PATCH 1/3] framadage : suppression image inutile (reste de build local, avant le registry) --- podman-framadate/10_install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/podman-framadate/10_install.sh b/podman-framadate/10_install.sh index 30246a8..ddd0e08 100755 --- a/podman-framadate/10_install.sh +++ b/podman-framadate/10_install.sh @@ -34,7 +34,6 @@ export listen_port if ! podman image exists ${framadate_image}:${framadate_version}; then podman pull ${framadate_image}:${framadate_version} fi -podman pull docker.io/library/php:7-apache && podman pull docker.io/library/mysql:5.7 && podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d && From bb839f1510a2c34370236c566e6c11a99ee44511 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 16 Dec 2022 20:57:35 +0100 Subject: [PATCH 2/3] hedgedoc : timer inutil, le souci n est pas la. --- podman-hedgedoc/10_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman-hedgedoc/10_install.sh b/podman-hedgedoc/10_install.sh index a2cfa1d..d9ababa 100755 --- a/podman-hedgedoc/10_install.sh +++ b/podman-hedgedoc/10_install.sh @@ -87,6 +87,6 @@ podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --sha echo -n "Waiting for hedgedoc to finish starting " && ( podman logs -f ${container_name} 2>&1 & ) | grep -q 'HTTP Server listening at ' && echo "OK" && -podman pod stop --time 30 ${pod_name} && +podman pod stop ${pod_name} && echo Pod built and stopped. && shred -u .env From 21e4652cf63fd1748daa99c1ec6855a0e9946d97 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Thu, 22 Dec 2022 11:33:21 +0100 Subject: [PATCH 3/3] Gitea 1.17.4 pour CI* --- podman-gitea/vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman-gitea/vars.sh b/podman-gitea/vars.sh index 908c21a..0734446 100644 --- a/podman-gitea/vars.sh +++ b/podman-gitea/vars.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ## vars gitea_image="git.garbaye.fr/garbaye/gitea" -gitea_version='1.17.3' +gitea_version='1.17.4' postgres_image="docker.io/library/postgres" postgres_version='14' ## default vars : override with ENV var