From d6061ecb386b9a2540066ce8bf6875d334e8f777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20M=C3=B3r=C3=A1sz?= Date: Sun, 5 Apr 2026 10:45:39 +0200 Subject: [PATCH] rename docker compose (#85) * rename docker compose * rename nginx conf too --- .github/workflows/ci.yml | 34 ++++++++++--------- README.md | 2 +- ...ompose.e2e.yaml => e2e.docker-compose.yaml | 2 +- nginx.e2e.conf => e2e.nginx.conf | 0 e2e/README.md | 4 +-- 5 files changed, 22 insertions(+), 20 deletions(-) rename docker-compose.e2e.yaml => e2e.docker-compose.yaml (97%) rename nginx.e2e.conf => e2e.nginx.conf (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6e3114..ffe821d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: unit-test-and-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup Node.js 24.x uses: actions/setup-node@v4 with: @@ -52,10 +52,10 @@ jobs: outputs: image_sha_tag: ${{ steps.image-tag.outputs.image_sha_tag }} steps: - - uses: actions/checkout@v4 - - uses: docker/setup-buildx-action@v3 + - uses: actions/checkout@v6 + - uses: docker/setup-buildx-action@v4 - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} @@ -78,7 +78,7 @@ jobs: echo "EOF" } >> "$GITHUB_OUTPUT" - name: Build and push frontend image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v7 with: context: ./frontend/ file: ./frontend/Dockerfile @@ -98,10 +98,10 @@ jobs: outputs: image_sha_tag: ${{ steps.image-tag.outputs.image_sha_tag }} steps: - - uses: actions/checkout@v4 - - uses: docker/setup-buildx-action@v3 + - uses: actions/checkout@v6 + - uses: docker/setup-buildx-action@v4 - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} @@ -124,7 +124,7 @@ jobs: echo "EOF" } >> "$GITHUB_OUTPUT" - name: Build and push e2e image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v7 with: context: ./e2e/ file: ./e2e/Dockerfile @@ -147,31 +147,33 @@ jobs: FRONTEND_IMAGE: ${{ needs.build-fe.outputs.image_sha_tag }} E2E_IMAGE: ${{ needs.build-e2e.outputs.image_sha_tag }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 + - name: Setup docker compose + uses: docker/setup-compose-action@v2 - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Pull images for test run - run: docker compose -f docker-compose.e2e.yaml pull + run: docker compose -f e2e.docker-compose.yaml pull - name: Run Docker Compose E2E tests - run: docker compose -f docker-compose.e2e.yaml up --no-build --abort-on-container-exit --exit-code-from e2e e2e + run: docker compose -f e2e.docker-compose.yaml up --no-build --abort-on-container-exit --exit-code-from e2e e2e - name: Upload Playwright HTML report if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: playwright-report path: e2e/playwright-report if-no-files-found: ignore - name: Upload Playwright test results if: always() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: playwright-test-results path: e2e/test-results if-no-files-found: ignore - name: Tear down Docker Compose stack if: always() - run: docker compose -f docker-compose.e2e.yaml down -v --remove-orphans + run: docker compose -f e2e.docker-compose.yaml down -v --remove-orphans diff --git a/README.md b/README.md index 52aad80..2a23639 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Later start the docker compose first and the project launch settings after the D For a fully containerized end-to-end run (tagged backend image + freshly built frontend/e2e images): ```shell -docker compose -f docker-compose.e2e.yaml up --build --abort-on-container-exit --exit-code-from e2e e2e +docker compose -f e2e.docker-compose.yaml up --build --abort-on-container-exit --exit-code-from e2e e2e ``` Use `BACKEND_IMAGE` to select a specific backend tag, and note this compose stack auto-generates TLS certificates for the nginx proxy. diff --git a/docker-compose.e2e.yaml b/e2e.docker-compose.yaml similarity index 97% rename from docker-compose.e2e.yaml rename to e2e.docker-compose.yaml index 99cfd38..3a7e674 100644 --- a/docker-compose.e2e.yaml +++ b/e2e.docker-compose.yaml @@ -41,7 +41,7 @@ services: ports: - "8000:8000" volumes: - - ./nginx.e2e.conf:/etc/nginx/nginx.conf:ro + - ./e2e.nginx.conf:/etc/nginx/nginx.conf:ro - tls-certs:/etc/nginx/certs:ro depends_on: certs: diff --git a/nginx.e2e.conf b/e2e.nginx.conf similarity index 100% rename from nginx.e2e.conf rename to e2e.nginx.conf diff --git a/e2e/README.md b/e2e/README.md index 5dd3010..be53ed3 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -43,14 +43,14 @@ Prerequisites: Run: ```shell -docker compose -f docker-compose.e2e.yaml up --build --abort-on-container-exit --exit-code-from e2e e2e +docker compose -f e2e.docker-compose.yaml up --build --abort-on-container-exit --exit-code-from e2e e2e ``` Run with a different backend tag: ```shell BACKEND_IMAGE=ghcr.io/morbalint/kemkas-backend: \ -docker compose -f docker-compose.e2e.yaml up --build --abort-on-container-exit --exit-code-from e2e e2e +docker compose -f e2e.docker-compose.yaml up --build --abort-on-container-exit --exit-code-from e2e e2e ``` The `certs` service generates a local CA and nginx server certificate in a shared volume.