diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b10e8fa..7d8ea6a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,8 @@ jobs: permissions: contents: read packages: write + attestations: write + id-token: write outputs: image_tag: ${{ steps.image-tag.outputs.image_tag }} steps: @@ -72,6 +74,8 @@ jobs: permissions: contents: read packages: write + attestations: write + id-token: write outputs: image_tag: ${{ steps.image-tag.outputs.image_tag }} steps: @@ -111,24 +115,14 @@ jobs: E2E_IMAGE: ${{ needs.docker-e2e-build.outputs.image_tag }} steps: - uses: actions/checkout@v4 - - name: Create GitHub App installation token - id: app-token - uses: actions/create-github-app-token@v1 - with: - app-id: ${{ secrets.E2E_APP_ID }} - private-key: ${{ secrets.E2E_APP_KEY }} - owner: ${{ github.repository_owner }} - repositories: | - kemkas - kemkas-backend - name: Log in to GitHub Container Registry uses: docker/login-action@v3 with: registry: ghcr.io - username: x-access-token - password: ${{ steps.app-token.outputs.token }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Pull images for test run - run: docker compose -f docker-compose.e2e.yaml pull backend frontend e2e + run: docker compose -f docker-compose.e2e.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 - name: Upload Playwright HTML report @@ -148,23 +142,3 @@ jobs: - name: Tear down Docker Compose stack if: always() run: docker compose -f docker-compose.e2e.yaml down -v --remove-orphans - -# No longer used, and token expired. - # deploy-to-beta: - # runs-on: ubuntu-latest - # needs: - # - docker-fe-build - # steps: - # - uses: actions/checkout@v4 - # with: - # repository: ${{ github.repository_owner }}/kemkas-deployment - # ref: refs/heads/main - # ssh-key: ${{ secrets.DEPLOYMENT_REPO_DEPLOY_KEY }} - # - uses: mikefarah/yq@v4 - # with: - # cmd: yq -i '.spec.template.spec.containers[0].image = "${{ needs.docker-fe-build.outputs.image_tag }}"' ./kemkas-beta/kemkas-fe-deployment.yaml - # - run: | - # git config --add user.email "beta-fe-deployment-bot@kemkas.hu" - # git config --add user.name "Deployment Bot Beta FE" - # git commit -a -m "deploy ${{ needs.docker-fe-build.outputs.image_tag }}" - # git push diff --git a/e2e/Dockerfile b/e2e/Dockerfile index 2f063fd..3a154e5 100644 --- a/e2e/Dockerfile +++ b/e2e/Dockerfile @@ -1,5 +1,7 @@ FROM mcr.microsoft.com/playwright:v1.59.1-noble +LABEL org.opencontainers.image.source = "https://github.com/morbalint/kemkas" + WORKDIR /work RUN apt-get update \ diff --git a/frontend/Dockerfile b/frontend/Dockerfile index c901fa0..ac674b3 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -12,5 +12,7 @@ RUN yarn build FROM nginx:1.29.7-alpine3.23 AS proxy +LABEL org.opencontainers.image.source = "https://github.com/morbalint/kemkas" + COPY --from=builder "/src/dist" "/usr/share/nginx/html" COPY ./nginx.conf /etc/nginx/nginx.conf