diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index fb71fd3..3e3143b 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -71,23 +71,37 @@ jobs: set -ex echo 'Logging in to registry on server...' echo \"$REGISTRY_PASS\" | docker login registry.infra.mintel.me -u \"$REGISTRY_USER\" --password-stdin - + echo 'Login successful' + cd /home/deploy/sites/mb-grid-solutions - + echo 'Changed to directory: $(pwd)' + ls -la + echo 'Pulling latest images...' # Try both .yml and .yaml if [ -f docker-compose.yml ]; then + echo 'Using docker-compose.yml' docker compose pull + echo 'Pull completed' + docker images registry.infra.mintel.me/mintel/mb-grid-solutions:latest --format 'Image ID after pull: {{.ID}}' docker compose up -d --force-recreate + echo 'Up completed' + docker ps --filter name=mb-grid-solutions --format 'Containers: {{.Names}} {{.Status}}' elif [ -f docker-compose.yaml ]; then + echo 'Using docker-compose.yaml' docker compose -f docker-compose.yaml pull + echo 'Pull completed' + docker images registry.infra.mintel.me/mintel/mb-grid-solutions:latest --format 'Image ID after pull: {{.ID}}' docker compose -f docker-compose.yaml up -d --force-recreate + echo 'Up completed' + docker ps --filter name=mb-grid-solutions --format 'Containers: {{.Names}} {{.Status}}' else echo 'No docker-compose file found!' ls -la exit 1 fi - + echo 'Pruning old images...' docker image prune -f + echo 'Deployment completed successfully' " diff --git a/docker-compose.yaml b/docker-compose.yaml index af8b053..8274dc9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,5 @@ services: app: - build: . image: registry.infra.mintel.me/mintel/mb-grid-solutions:latest restart: always expose: