Compare commits

..

No commits in common. "master" and "finley/142" have entirely different histories.

4 changed files with 2 additions and 20 deletions

View file

@ -29,10 +29,7 @@ services:
- ./conf/nginx-site.prod.conf:/etc/nginx/conf.d/cmc.conf - ./conf/nginx-site.prod.conf:/etc/nginx/conf.d/cmc.conf
- ./userpasswd:/etc/nginx/userpasswd:ro - ./userpasswd:/etc/nginx/userpasswd:ro
depends_on: depends_on:
cmc-prod-php: - cmc-prod-php
condition: service_started
cmc-prod-go:
condition: service_started
restart: unless-stopped restart: unless-stopped
networks: networks:
- cmc-prod-network - cmc-prod-network

View file

@ -27,10 +27,7 @@ services:
- ./conf/nginx-site.stg.conf:/etc/nginx/conf.d/cmc.conf - ./conf/nginx-site.stg.conf:/etc/nginx/conf.d/cmc.conf
- ./userpasswd:/etc/nginx/userpasswd:ro - ./userpasswd:/etc/nginx/userpasswd:ro
depends_on: depends_on:
cmc-stg-php: - cmc-stg-php
condition: service_started
cmc-stg-go:
condition: service_started
restart: unless-stopped restart: unless-stopped
networks: networks:
- cmc-stg-network - cmc-stg-network

View file

@ -85,12 +85,6 @@ ENVEOF
docker compose --env-file .env.prod -f docker-compose.prod.yml build docker compose --env-file .env.prod -f docker-compose.prod.yml build
docker compose --env-file .env.prod -f docker-compose.prod.yml up -d --remove-orphans docker compose --env-file .env.prod -f docker-compose.prod.yml up -d --remove-orphans
fi fi
echo "Waiting for services to be ready..."
sleep 5
echo "Restarting nginx to ensure proper connectivity..."
docker compose --env-file .env.prod -f docker-compose.prod.yml restart nginx
echo "Checking running containers..." echo "Checking running containers..."
docker compose --env-file .env.prod -f docker-compose.prod.yml ps docker compose --env-file .env.prod -f docker-compose.prod.yml ps

View file

@ -76,12 +76,6 @@ ENVEOF
docker compose -f docker-compose.stg.yml build docker compose -f docker-compose.stg.yml build
docker compose -f docker-compose.stg.yml up -d --remove-orphans docker compose -f docker-compose.stg.yml up -d --remove-orphans
fi fi
echo "Waiting for services to be ready..."
sleep 5
echo "Restarting nginx to ensure proper connectivity..."
docker compose -f docker-compose.stg.yml restart nginx
echo "Checking running containers..." echo "Checking running containers..."
docker compose -f docker-compose.stg.yml ps docker compose -f docker-compose.stg.yml ps