fix podman-compose + python (5/x)

This commit is contained in:
Gitouche 2024-06-11 22:04:14 +02:00
parent 180142bfe9
commit 7090529936
6 changed files with 5 additions and 6 deletions

View file

@ -361,4 +361,3 @@ if [[ ! -z ${podman_compose_path} ]]; then
fi fi
done done
fi fi
}

View file

@ -67,7 +67,7 @@ echo "COLIBRI_REST_ENABLED=1" >> .env
export listen_if export listen_if
export listen_port export listen_port
python3.9 podman-compose --pod-args "--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d && ${my_podman_compose} --pod-args "--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
# Wait for web to be up # Wait for web to be up
( podman container logs --tail=3 -f ${project_name}_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' && ( podman container logs --tail=3 -f ${project_name}_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&

View file

@ -38,7 +38,7 @@ if ! podman image exists ${synapse_image}:${synapse_version}; then
podman image pull ${synapse_image}:${synapse_version} || exit 1 podman image pull ${synapse_image}:${synapse_version} || exit 1
fi fi
podman image pull ${postgres_image}:${postgres_version} && podman image pull ${postgres_image}:${postgres_version} &&
python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d && ${my_podman_compose} --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
end=$((SECONDS+120)) end=$((SECONDS+120))
while [ $SECONDS -lt $end ]; do while [ $SECONDS -lt $end ]; do

View file

@ -41,7 +41,7 @@ if ! podman image exists ${seafile_image}:${seafile_release}; then
fi fi
podman image pull docker.io/library/memcached:${memcached_release} && podman image pull docker.io/library/memcached:${memcached_release} &&
podman image pull docker.io/library/mariadb:${mariadb_release} && podman image pull docker.io/library/mariadb:${mariadb_release} &&
python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d && ${my_podman_compose} --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
echo -n "Waiting for seahub_settings.py " && echo -n "Waiting for seahub_settings.py " &&
while [ ! -e `get_podman_volume_path ${datavolume}`/seafile/conf/seahub_settings.py ]; do while [ ! -e `get_podman_volume_path ${datavolume}`/seafile/conf/seahub_settings.py ]; do
echo -n "." echo -n "."

View file

@ -40,7 +40,7 @@ export listen_port
if ! podman image exists ${service_image}:${service_version}; then if ! podman image exists ${service_image}:${service_version}; then
podman image pull ${service_image}:${service_version} || exit 1 podman image pull ${service_image}:${service_version} || exit 1
fi fi
python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d && ${my_podman_compose} --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
echo -n "Waiting for vaultwarden to finish starting " && echo -n "Waiting for vaultwarden to finish starting " &&
( podman container logs -f ${container_name} 2>&1 & ) | grep -q 'Rocket has launched from ' && ( podman container logs -f ${container_name} 2>&1 & ) | grep -q 'Rocket has launched from ' &&
echo "OK" && echo "OK" &&

View file

@ -35,7 +35,7 @@ if ! podman image exists ${wp_image}:${wp_version}; then
fi fi
podman image pull ${mysql_image}:${mysql_version} && podman image pull ${mysql_image}:${mysql_version} &&
python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d && ${my_podman_compose} --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
sleep 10 # TODO : wait for healthckeck on mariadb sleep 10 # TODO : wait for healthckeck on mariadb
shred -u .env && shred -u .env &&
podman pod stop ${pod_name} podman pod stop ${pod_name}