From bb293b6a8177a7a10a0384b51676c9a58f4a6434 Mon Sep 17 00:00:00 2001 From: DigiServer Admin Date: Thu, 15 Jan 2026 09:00:32 +0200 Subject: [PATCH] updated docvker compose --- deploy.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/deploy.sh b/deploy.sh index 05de93e..442881c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -16,10 +16,10 @@ echo -e "${BLUE}║ DigiServer Automated Deployment echo -e "${BLUE}╚════════════════════════════════════════════════════════════════╝${NC}" echo "" -# Check if docker-compose is available -if ! command -v docker-compose &> /dev/null; then - echo -e "${RED}❌ docker-compose not found!${NC}" - echo "Please install docker-compose first" +# Check if docker compose is available +if ! docker compose version &> /dev/null; then + echo -e "${RED}❌ docker compose not found!${NC}" + echo "Please install docker compose first" exit 1 fi @@ -51,15 +51,15 @@ echo "" # STEP 1: Start containers # ============================================================================ echo -e "${YELLOW}📦 [1/6] Starting containers...${NC}" -docker-compose up -d +docker compose up -d echo -e "${YELLOW}⏳ Waiting for containers to be healthy...${NC}" sleep 10 # Verify containers are running -if ! docker-compose ps | grep -q "Up"; then +if ! docker compose ps | grep -q "Up"; then echo -e "${RED}❌ Containers failed to start!${NC}" - docker-compose logs + docker compose logs exit 1 fi echo -e "${GREEN}✅ Containers started successfully${NC}" @@ -71,13 +71,13 @@ echo "" echo -e "${YELLOW}📊 [2/6] Running database migrations...${NC}" echo -e " • Creating https_config table..." -docker-compose exec -T digiserver-app python /app/migrations/add_https_config_table.py +docker compose exec -T digiserver-app python /app/migrations/add_https_config_table.py echo -e " • Creating player_user table..." -docker-compose exec -T digiserver-app python /app/migrations/add_player_user_table.py +docker compose exec -T digiserver-app python /app/migrations/add_player_user_table.py echo -e " • Adding email to https_config..." -docker-compose exec -T digiserver-app python /app/migrations/add_email_to_https_config.py +docker compose exec -T digiserver-app python /app/migrations/add_email_to_https_config.py echo -e " • Migrating player_user global settings..." -docker-compose exec -T digiserver-app python /app/migrations/migrate_player_user_global.py +docker compose exec -T digiserver-app python /app/migrations/migrate_player_user_global.py echo -e "${GREEN}✅ All database migrations completed${NC}" echo "" @@ -87,7 +87,7 @@ echo "" # ============================================================================ echo -e "${YELLOW}🔒 [3/6] Configuring HTTPS...${NC}" -docker-compose exec -T digiserver-app python /app/https_manager.py enable \ +docker compose exec -T digiserver-app python /app/https_manager.py enable \ "$HOSTNAME" \ "$DOMAIN" \ "$EMAIL" \ @@ -102,7 +102,7 @@ echo "" # ============================================================================ echo -e "${YELLOW}🔍 [4/6] Verifying database setup...${NC}" -docker-compose exec -T digiserver-app python -c " +docker compose exec -T digiserver-app python -c " from app.app import create_app from sqlalchemy import inspect @@ -123,7 +123,7 @@ echo "" # ============================================================================ echo -e "${YELLOW}🔧 [5/6] Verifying Caddy configuration...${NC}" -docker-compose exec -T caddy caddy validate --config /etc/caddy/Caddyfile >/dev/null 2>&1 +docker compose exec -T caddy caddy validate --config /etc/caddy/Caddyfile >/dev/null 2>&1 if [ $? -eq 0 ]; then echo -e " ${GREEN}✅ Caddy configuration is valid${NC}" else @@ -137,7 +137,7 @@ echo "" echo -e "${YELLOW}📋 [6/6] Displaying configuration summary...${NC}" echo "" -docker-compose exec -T digiserver-app python /app/https_manager.py status +docker compose exec -T digiserver-app python /app/https_manager.py status echo "" echo -e "${GREEN}╔════════════════════════════════════════════════════════════════╗${NC}"