Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Gitouche 2022-12-25 21:49:25 +01:00
commit ac75333b99
3 changed files with 2 additions and 3 deletions

View file

@ -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 &&

View file

@ -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

View file

@ -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