diff --git a/.gitea/workflows/commentDeploy.yml b/.gitea/workflows/commentDeploy.yml index 7791d22..6f9bbc0 100644 --- a/.gitea/workflows/commentDeploy.yml +++ b/.gitea/workflows/commentDeploy.yml @@ -76,7 +76,7 @@ jobs: - name: Stop existing deployment run: | - docker compose --context deploy_target -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} down --remove-orphans || true + DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} down --remove-orphans || true - name: Pull latest images run: | @@ -85,20 +85,20 @@ jobs: - name: Deploy with Docker Compose id: deploy run: | - docker-compose --context deploy_target -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} up -d + DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} up -d echo "Waiting for services to start..." sleep 10 - CONTAINERS=$(docker-compose --context deploy_target -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps --services | tr '\n' ',' | sed 's/,$//') + CONTAINERS=$(DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps --services | tr '\n' ',' | sed 's/,$//') echo "containers=$CONTAINERS" >> $GITHUB_OUTPUT echo "✅ Deployment completed successfully!" - echo "🌐 URL: ${{ inputs.url }}" + echo "🌐 URL: ${{ steps.branch_name.outputs.branch_name }}.phoenix.klemp.local" echo "📦 Containers: $CONTAINERS" - name: Show deployment status run: | echo "=== Deployment Status ===" - docker-compose --context deploy_target -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps + DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps echo "=========================" diff --git a/docker-compose.yml b/docker-compose.yml index cba3f43..c6a47a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,13 @@ -version: '3.8' networks: default: - external: - name: traefik-proxy + name: traefik-prox + external: true services: app: image: ${IMAGE_URL} container_name: ${PROJECT_NAME}-app restart: unless-stopped - networks: - - traefik - - internal labels: - traefik.enable=true - traefik.docker.network=traefik-proxy