From ce448217eb28abfc8a388e5273fe5ce69715e6d1 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Sun, 5 Feb 2023 17:17:22 +0100 Subject: [PATCH] Use lowercase owner in repository name --- .github/workflows/tests.yaml | 8 +++++-- .../update-task-in-docker-images.yml | 21 ++++++++++++------- .../update-timew-in-docker-images.yml | 21 ++++++++++++------- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 8adb869..933427f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -39,6 +39,10 @@ jobs: runs-on: ${{ matrix.runner }} continue-on-error: ${{ matrix.continue-on-error == true }} steps: + - name: Create lowercase repository name + run: | + GHCR_REPOSITORY="${{ github.repository_owner }}" + echo "REPOSITORY=${GHCR_REPOSITORY,,}" >> ${GITHUB_ENV} - uses: actions/checkout@v3 - name : Login to GHCR uses : docker/login-action@v2.1.0 @@ -49,7 +53,7 @@ jobs: - name: Build ${{ matrix.name }} env: REGISTRY: ghcr.io - OWNER: ${{ github.repository_owner }} + OWNER: ${{ env.REPOSITORY }} GITHUB_USER: ${{ github.repository_owner }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CONTAINER: ${{ matrix.container }} @@ -57,7 +61,7 @@ jobs: - name: Test ${{ matrix.name }} env: REGISTRY: ghcr.io - OWNER: ${{ github.repository_owner }} + OWNER: ${{ env.REPOSITORY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CONTAINER: ${{ matrix.container }} run: docker-compose run ${CONTAINER} diff --git a/.github/workflows/update-task-in-docker-images.yml b/.github/workflows/update-task-in-docker-images.yml index 5a3995c..00c183c 100644 --- a/.github/workflows/update-task-in-docker-images.yml +++ b/.github/workflows/update-task-in-docker-images.yml @@ -25,6 +25,11 @@ jobs: id-token: write steps: + - name: Create lowercase repository name + run: | + GHCR_REPOSITORY="${{ github.repository_owner }}" + echo "REPOSITORY=${GHCR_REPOSITORY,,}" >> ${GITHUB_ENV} + - name: Checkout repository uses: actions/checkout@v3 @@ -46,14 +51,14 @@ jobs: file: "./test/docker/task-timew.dockerfile" push: true build-args: | - TASK_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/task:${{ env.RELEASE }} - TIMEW_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/timew:develop - tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew:${{ env.RELEASE }}-develop + TASK_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task:${{ env.RELEASE }} + TIMEW_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/timew:develop + tags: ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew:${{ env.RELEASE }}-develop - name: Sign the published Docker image env: COSIGN_EXPERIMENTAL: "true" - run: cosign sign ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew@${{ steps.build-and-push-develop.outputs.digest }} + run: cosign sign ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew@${{ steps.build-and-push-develop.outputs.digest }} - name: Build and push Taskwarrior [${{ env.RELEASE }}]/Timewarrior [stable] Docker image id: build-and-push-stable @@ -63,11 +68,11 @@ jobs: file: "./test/docker/task-timew.dockerfile" push: true build-args: | - TASK_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/task:${{ env.RELEASE }} - TIMEW_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/timew:stable - tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew:${{ env.RELEASE }}-stable + TASK_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task:${{ env.RELEASE }} + TIMEW_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/timew:stable + tags: ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew:${{ env.RELEASE }}-stable - name: Sign the published Docker image env: COSIGN_EXPERIMENTAL: "true" - run: cosign sign ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew@${{ steps.build-and-push-stable.outputs.digest }} + run: cosign sign ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew@${{ steps.build-and-push-stable.outputs.digest }} diff --git a/.github/workflows/update-timew-in-docker-images.yml b/.github/workflows/update-timew-in-docker-images.yml index 72fb201..dbd0116 100644 --- a/.github/workflows/update-timew-in-docker-images.yml +++ b/.github/workflows/update-timew-in-docker-images.yml @@ -25,6 +25,11 @@ jobs: id-token: write steps: + - name: Create lowercase repository name + run: | + GHCR_REPOSITORY="${{ github.repository_owner }}" + echo "REPOSITORY=${GHCR_REPOSITORY,,}" >> ${GITHUB_ENV} + - name: Checkout repository uses: actions/checkout@v3 @@ -46,14 +51,14 @@ jobs: file: "./test/docker/task-timew.dockerfile" push: true build-args: | - TASK_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/task:develop - TIMEW_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/timew:${{ env.RELEASE }} - tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew:develop-${{ env.RELEASE }} + TASK_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task:develop + TIMEW_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/timew:${{ env.RELEASE }} + tags: ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew:develop-${{ env.RELEASE }} - name: Sign the published Docker image env: COSIGN_EXPERIMENTAL: "true" - run: cosign sign ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew@${{ steps.build-and-push-develop.outputs.digest }} + run: cosign sign ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew@${{ steps.build-and-push-develop.outputs.digest }} - name: Build and push Taskwarrior [stable]/Timewarrior [${{ env.RELEASE }}] Docker image id: build-and-push-stable @@ -63,11 +68,11 @@ jobs: file: "./test/docker/task-timew.dockerfile" push: true build-args: | - TASK_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/task:stable - TIMEW_IMAGE=${{ env.REGISTRY }}/${{ github.repository_owner }}/timew:${{ env.RELEASE }} - tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew:stable-${{ env.RELEASE }} + TASK_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task:stable + TIMEW_IMAGE=${{ env.REGISTRY }}/${{ env.REPOSITORY }}/timew:${{ env.RELEASE }} + tags: ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew:stable-${{ env.RELEASE }} - name: Sign the published Docker image env: COSIGN_EXPERIMENTAL: "true" - run: cosign sign ${{ env.REGISTRY }}/${{ github.repository_owner }}/task-timew@${{ steps.build-and-push-stable.outputs.digest }} + run: cosign sign ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/task-timew@${{ steps.build-and-push-stable.outputs.digest }}