Compare commits

2 Commits

Author SHA1 Message Date
Quality App Developer
cf44843418 merge: integrate nginx reverse proxy and deployment improvements
- Nginx reverse proxy configuration (replacing Caddy)
- ProxyFix middleware for handling X-Forwarded-* headers
- Docker Compose with Nginx service (nginx:alpine)
- Complete deployment workflow and documentation
- Self-signed SSL certificate generation script
- Removed obsolete Caddy-related files
- Fixed file permissions and ownership (no sudo needed)
- Comprehensive quick deployment guide
- Ready for HTTPS deployment on IP:443
2026-01-15 22:41:57 +02:00
DigiServer Admin
bb293b6a81 updated docvker compose 2026-01-15 09:00:32 +02:00

View File

@@ -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}"