Compare commits

..

4 Commits

Author SHA1 Message Date
07714d2b04 Merge pull request 'Reverting --wait parameter' (#57) from adding-back-wait into main
All checks were successful
Remote Deployment Pipeline / Prepare Context (push) Successful in 2s
Remote Deployment Pipeline / Deploy (Staging) (push) Successful in 52s
Remote Deployment Pipeline / Deploy (Dev/Preview) (push) Has been skipped
Remote Deployment Pipeline / Cleanup Preview (push) Has been skipped
Remote Deployment Pipeline / Deploy (Pre-Prod) (push) Successful in 1m12s
Remote Deployment Pipeline / Deploy (Production) (push) Successful in 57s
Reviewed-on: #57
2026-05-08 21:40:14 +02:00
5c1bc7d803 Reverting --wait parameter
All checks were successful
Remote Deployment Pipeline / Prepare Context (pull_request) Successful in 3s
Remote Deployment Pipeline / Deploy (Staging) (pull_request) Has been skipped
Remote Deployment Pipeline / Deploy (Dev/Preview) (pull_request) Has been skipped
Remote Deployment Pipeline / Cleanup Preview (pull_request) Successful in 12s
Remote Deployment Pipeline / Deploy (Pre-Prod) (pull_request) Has been skipped
Remote Deployment Pipeline / Deploy (Production) (pull_request) Has been skipped
2026-05-08 21:38:34 +02:00
89e4d31328 Merge pull request 'Add docker-compose client configuration' (#56) from add-client-docker-compose-config into main
All checks were successful
Remote Deployment Pipeline / Prepare Context (push) Successful in 2s
Remote Deployment Pipeline / Deploy (Staging) (push) Successful in 58s
Remote Deployment Pipeline / Deploy (Dev/Preview) (push) Has been skipped
Remote Deployment Pipeline / Cleanup Preview (push) Has been skipped
Remote Deployment Pipeline / Deploy (Pre-Prod) (push) Successful in 1m20s
Remote Deployment Pipeline / Deploy (Production) (push) Successful in 1m20s
Reviewed-on: #56
2026-05-08 21:13:38 +02:00
5fbd781b7f Add docker-compose client configuration
All checks were successful
Remote Deployment Pipeline / Prepare Context (pull_request) Successful in 4s
Remote Deployment Pipeline / Deploy (Staging) (pull_request) Has been skipped
Remote Deployment Pipeline / Deploy (Dev/Preview) (pull_request) Has been skipped
Remote Deployment Pipeline / Deploy (Pre-Prod) (pull_request) Has been skipped
Remote Deployment Pipeline / Cleanup Preview (pull_request) Successful in 13s
Remote Deployment Pipeline / Deploy (Production) (pull_request) Has been skipped
2026-05-08 21:11:55 +02:00
2 changed files with 13 additions and 4 deletions

View File

@@ -66,7 +66,7 @@ jobs:
SCRIPT_AFTER: | SCRIPT_AFTER: |
set -e set -e
cd ${{ needs.prepare_context.outputs.pr_path }} 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 -f docker-compose.dev.yaml up -d --build --remove-orphans --wait
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# STAGE 3: DEPLOY STAGING # STAGE 3: DEPLOY STAGING
@@ -92,7 +92,7 @@ jobs:
SCRIPT_AFTER: | SCRIPT_AFTER: |
set -e set -e
cd ${{ env.REMOTE_STAGING_PATH }} cd ${{ env.REMOTE_STAGING_PATH }}
docker compose --env-file staging.env -f docker-compose.yaml up -d --build --remove-orphans docker compose --env-file staging.env -f docker-compose.yaml -f docker-compose.client.yaml up -d --build --remove-orphans --wait
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# STAGE 3.5: DEPLOY PRE-PROD # STAGE 3.5: DEPLOY PRE-PROD
@@ -119,7 +119,7 @@ jobs:
SCRIPT_AFTER: | SCRIPT_AFTER: |
set -e set -e
cd ${{ env.REMOTE_PREPROD_PATH }} cd ${{ env.REMOTE_PREPROD_PATH }}
docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml -f docker-compose.preprod.yaml up -d --build --remove-orphans docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml -f docker-compose.preprod.yaml up -d --build --remove-orphans --wait
- name: Run E2E Tests - name: Run E2E Tests
uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5 uses: appleboy/ssh-action@0ff4204d59e8e51228ff73bce53f80d53301dee2 # v1.2.5
@@ -181,7 +181,7 @@ jobs:
SCRIPT_AFTER: | SCRIPT_AFTER: |
set -e set -e
cd ${{ env.REMOTE_PROD_PATH }} cd ${{ env.REMOTE_PROD_PATH }}
docker compose --env-file prod.env -f docker-compose.yaml -f docker-compose.prod.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 --wait
# Run E2E Tests # Run E2E Tests
echo "Running E2E tests..." echo "Running E2E tests..."

View File

@@ -0,0 +1,9 @@
services:
traefik:
networks:
- proxy
- shared_network
networks:
shared_network:
name: prod_shared-network
external: true