diff --git a/.gitea/workflows/dev-deploy.yml b/.gitea/workflows/dev-deploy.yml index 068053d..2f34bdc 100644 --- a/.gitea/workflows/dev-deploy.yml +++ b/.gitea/workflows/dev-deploy.yml @@ -70,10 +70,15 @@ jobs: echo "🔄 Removing old images to force re-pull..." docker rmi postgres:15-alpine redis:7-alpine 2>/dev/null || true + # Ensure networks exist before compose starts (network is external) + echo "🌐 Ensuring networks exist..." + docker network create portfolio_dev 2>/dev/null || true + docker network create proxy 2>/dev/null || true + # Pull images with correct architecture (Docker will auto-detect) echo "📥 Pulling images for current architecture..." docker compose -f $COMPOSE_FILE pull postgres redis - + # Start containers echo "📦 Starting PostgreSQL and Redis containers..." docker compose -f $COMPOSE_FILE up -d postgres redis @@ -192,25 +197,6 @@ jobs: fi fi - # Ensure networks exist - echo "🌐 Checking for networks..." - if ! docker network inspect proxy >/dev/null 2>&1; then - echo "⚠️ Proxy network not found, creating it..." - docker network create proxy 2>/dev/null || echo "Network might already exist or creation failed" - else - echo "✅ Proxy network exists" - fi - - if ! docker network inspect portfolio_dev >/dev/null 2>&1; then - echo "⚠️ Portfolio dev network not found, creating it..." - docker network create portfolio_dev 2>/dev/null || echo "Network might already exist or creation failed" - else - echo "✅ Portfolio dev network exists" - fi - - # Connect proxy network to portfolio_dev network if needed - # (This allows the app to access both proxy and DB/Redis) - # Start new container with updated image echo "🆕 Starting new dev container..." docker run -d \ diff --git a/docker-compose.dev.minimal.yml b/docker-compose.dev.minimal.yml index 880b8f4..e110cf3 100644 --- a/docker-compose.dev.minimal.yml +++ b/docker-compose.dev.minimal.yml @@ -36,8 +36,7 @@ services: networks: portfolio_dev: - name: portfolio_dev - driver: bridge + external: true volumes: postgres_dev_data: