Merge branch 'master' of github.com:enricofer/djakart

enricofer · Jun 17, 2024 · 76ab4fe · 76ab4fe
2 parents 8fc05d2 + 9ee612d
commit 76ab4fe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/build_deploy_run.yml b/.github/workflows/build_deploy_run.yml
@@ -29,7 +29,7 @@ jobs:
        run: docker compose up -d
 
     -  name: CHECK HEALTH
-       run: timeout 120s sh -c 'until docker ps | grep djakart-webapp_djakart | grep -q healthy; do echo "Waiting for container to be healthy..."; sleep 2; done'
+       run: timeout 240s sh -c 'until docker ps | grep djakart-webapp_djakart | grep -q healthy; do echo "Waiting for container to be healthy..."; sleep 2; done'
 
     -  name: LIST CONTAINERS
        run: docker ps

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -43,7 +43,6 @@ services:
     env_file:
       - .env
     volumes:
-      #- ./servizi:/servizi
       - ./data/kart_versions:/kart_versions
       - ./webapp/djakart/otf_qgisserver_plugin:/plugins/otf_qgisserver_plugin
       - ./000-default.conf:/etc/apache2/sites-enabled/000-default.conf