diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index b8bcbd7..3ec84c9 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -30,6 +30,7 @@ jobs: pr_path: ${{ steps.calc.outputs.pr_path }} steps: - id: calc + name: Prepare Context run: | REPO_NAME=$(echo "${{ github.repository }}" | cut -d '/' -f 2) if [[ "${{ github.event_name }}" == "pull_request" ]]; then @@ -63,7 +64,7 @@ jobs: # 2. Run Docker Compose after sync SCRIPT_AFTER: | cd ${{ needs.prepare_context.outputs.pr_path }} - docker compose --env-file dev.env -f docker-compose.yaml -f docker-compose.dev.yaml up -d --build --remove-orphans + docker compose --env-file dev.env -f docker-compose.yaml up -d --build --remove-orphans # ------------------------------------------------------------------ # STAGE 3: DEPLOY STAGING @@ -114,7 +115,7 @@ jobs: mkdir -p ${{ env.REMOTE_PROD_PATH }} SCRIPT_AFTER: | cd ${{ env.REMOTE_PROD_PATH }} - docker compose --env-file prod.env -f docker-compose.yaml up -d --build --remove-orphans + docker compose --env-file prod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans # ------------------------------------------------------------------ # CLEANUP (Using appleboy/ssh-action for pure command execution) diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml deleted file mode 100644 index dfbe234..0000000 --- a/docker-compose.dev.yaml +++ /dev/null @@ -1,9 +0,0 @@ -services: - traefik: - networks: - - proxy - - legacy-nginx -networks: - legacy-nginx: - name: proxy - external: true