- Adjust timeout for start ogCore service
oginstaller/pipeline/head This commit looks good Details

- Improves script detection for service
move-to-docker
Nicolas Arenas 2024-11-06 08:47:20 +01:00
parent 0fdf8b3c03
commit f591717485
2 changed files with 24 additions and 2 deletions

View File

@ -30,6 +30,7 @@ WorkingDirectory=/opt/opengnsys/ogCore/repo/
ExecStart=/usr/bin/docker compose -f /opt/opengnsys/ogCore/etc/docker-compose-deploy.yml up
ExecStartPost=/opengnsys-installer/provision_ogcore.sh
ExecStop=/usr/bin/docker compose -f /opt/opengnsys/ogCore/etc/docker-compose-deploy.yml stop
TimeoutSec=600
Restart=always
[Install]

View File

@ -16,10 +16,31 @@ if [ -f /opt/opengnsys/ogCore/installer/.deployed ]; then
exit 0
fi
while ! docker compose -f $CONF_DIR/docker-compose-deploy.yml ps --format json |jq -r '"\(.Name) \(.State)"' |grep -q 'ogcore-php running'; do
sleep 2
CONF_DIR=/opt/opengnsys/ogCore/etc/
containers="ogcore-database ogcore-php gcore-nginx"
while true ; do
all_running=true
for container in $containers; do
if ! docker compose -f $CONF_DIR/docker-compose-deploy.yml ps --format json |jq -r '"\(.Name) \(.State)"' |grep -q "$container running"
then
echo "El contenedor $container no está corriendo"
all_running=false
fi
done
if $all_running; then
echo "Todos los contenedores están corriendo"
break
fi
sleep 5
done
# while ! docker compose -f $CONF_DIR/docker-compose-deploy.yml ps --format json |jq -r '"\(.Name) \(.State)"' |grep -q 'ogcore-php running'; do
# sleep 2
# done
sleep 5
adminuser=$(jq -r '.username' /opt/opengnsys/ogCore/installer/config.json)
adminpass=$(jq -r '.password' /opt/opengnsys/ogCore/installer/config.json)