updated docvker compose
This commit is contained in:
30
deploy.sh
30
deploy.sh
@@ -16,10 +16,10 @@ echo -e "${BLUE}║ DigiServer Automated Deployment
|
|||||||
echo -e "${BLUE}╚════════════════════════════════════════════════════════════════╝${NC}"
|
echo -e "${BLUE}╚════════════════════════════════════════════════════════════════╝${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Check if docker-compose is available
|
# Check if docker compose is available
|
||||||
if ! command -v docker-compose &> /dev/null; then
|
if ! docker compose version &> /dev/null; then
|
||||||
echo -e "${RED}❌ docker-compose not found!${NC}"
|
echo -e "${RED}❌ docker compose not found!${NC}"
|
||||||
echo "Please install docker-compose first"
|
echo "Please install docker compose first"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -51,15 +51,15 @@ echo ""
|
|||||||
# STEP 1: Start containers
|
# STEP 1: Start containers
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
echo -e "${YELLOW}📦 [1/6] Starting containers...${NC}"
|
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}"
|
echo -e "${YELLOW}⏳ Waiting for containers to be healthy...${NC}"
|
||||||
sleep 10
|
sleep 10
|
||||||
|
|
||||||
# Verify containers are running
|
# 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}"
|
echo -e "${RED}❌ Containers failed to start!${NC}"
|
||||||
docker-compose logs
|
docker compose logs
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo -e "${GREEN}✅ Containers started successfully${NC}"
|
echo -e "${GREEN}✅ Containers started successfully${NC}"
|
||||||
@@ -71,13 +71,13 @@ echo ""
|
|||||||
echo -e "${YELLOW}📊 [2/6] Running database migrations...${NC}"
|
echo -e "${YELLOW}📊 [2/6] Running database migrations...${NC}"
|
||||||
|
|
||||||
echo -e " • Creating https_config table..."
|
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..."
|
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..."
|
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..."
|
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 -e "${GREEN}✅ All database migrations completed${NC}"
|
||||||
echo ""
|
echo ""
|
||||||
@@ -87,7 +87,7 @@ echo ""
|
|||||||
# ============================================================================
|
# ============================================================================
|
||||||
echo -e "${YELLOW}🔒 [3/6] Configuring HTTPS...${NC}"
|
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" \
|
"$HOSTNAME" \
|
||||||
"$DOMAIN" \
|
"$DOMAIN" \
|
||||||
"$EMAIL" \
|
"$EMAIL" \
|
||||||
@@ -102,7 +102,7 @@ echo ""
|
|||||||
# ============================================================================
|
# ============================================================================
|
||||||
echo -e "${YELLOW}🔍 [4/6] Verifying database setup...${NC}"
|
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 app.app import create_app
|
||||||
from sqlalchemy import inspect
|
from sqlalchemy import inspect
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ echo ""
|
|||||||
# ============================================================================
|
# ============================================================================
|
||||||
echo -e "${YELLOW}🔧 [5/6] Verifying Caddy configuration...${NC}"
|
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
|
if [ $? -eq 0 ]; then
|
||||||
echo -e " ${GREEN}✅ Caddy configuration is valid${NC}"
|
echo -e " ${GREEN}✅ Caddy configuration is valid${NC}"
|
||||||
else
|
else
|
||||||
@@ -137,7 +137,7 @@ echo ""
|
|||||||
echo -e "${YELLOW}📋 [6/6] Displaying configuration summary...${NC}"
|
echo -e "${YELLOW}📋 [6/6] Displaying configuration summary...${NC}"
|
||||||
echo ""
|
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 ""
|
||||||
echo -e "${GREEN}╔════════════════════════════════════════════════════════════════╗${NC}"
|
echo -e "${GREEN}╔════════════════════════════════════════════════════════════════╗${NC}"
|
||||||
|
|||||||
Reference in New Issue
Block a user