From 880314ccc0e33e80a0bcb155d14c0cbb98454cb8 Mon Sep 17 00:00:00 2001 From: Philipp Wundrack Date: Tue, 21 Mar 2023 17:10:28 +0100 Subject: [PATCH 1/4] replace docker hub with GitHub registry --- .github/workflows/build.yml | 46 +++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 100214542e..695126edcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,10 @@ on: - "v*.*.*" pull_request: +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: pre_job: @@ -15,7 +19,7 @@ jobs: runs-on: ubuntu-latest outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} - docker_run_required: ${{ (github.repository_owner == 'OpenTOSCA' && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags'))) }} + docker_run_required: ${{ true }} # ${{ (github.repository_owner == 'OpenTOSCA' && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags'))) }} steps: - id: skip_check uses: fkirc/skip-duplicate-actions@master @@ -107,41 +111,39 @@ jobs: uses: docker/setup-qemu-action@v2 with: platforms: amd64,arm64,arm - - name: Set variables - id: vars - run: | - DOCKER_IMAGE=opentosca/winery - VERSION=latest - SHORTREF=${GITHUB_SHA::8} - - # If this is git tag, use the tag name - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/v} - fi - TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" - - # Set output parameters. - echo ::set-output name=tags::${TAGS} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v3 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Extract metadata (tags, labels) for Docker + id: meta-cli + uses: docker/metadata-action@v3 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-cli - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to DockerHub uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push latest Docker image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: . file: Dockerfile.noBuild platforms: linux/amd64,linux/arm64 push: true - tags: ${{ steps.vars.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} - name: Build and push latest CLI Docker image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: . file: Dockerfile.cli platforms: linux/amd64,linux/arm64 push: true - tags: 'opentosca/winery-cli:latest' + tags: ${{ steps.meta-cli.outputs.tags }} + labels: ${{ steps.meta-cli.outputs.labels }} From 0a7a5bf30c85bc038714b09c716d6ae4b4c90b61 Mon Sep 17 00:00:00 2001 From: Philipp Wundrack Date: Tue, 21 Mar 2023 17:27:56 +0100 Subject: [PATCH 2/4] update metadata action --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 695126edcd..78aef22caf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,12 +113,12 @@ jobs: platforms: amd64,arm64,arm - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Extract metadata (tags, labels) for Docker id: meta-cli - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-cli - name: Set up Docker Buildx From bb2129d92c64a6d79feaa8f7499ee009ce9986fd Mon Sep 17 00:00:00 2001 From: Philipp Wundrack Date: Wed, 22 Mar 2023 10:18:55 +0100 Subject: [PATCH 3/4] reenable conditional docker build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78aef22caf..7721d1124f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} - docker_run_required: ${{ true }} # ${{ (github.repository_owner == 'OpenTOSCA' && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags'))) }} + docker_run_required: ${{ (github.repository_owner == 'OpenTOSCA' && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags'))) }} steps: - id: skip_check uses: fkirc/skip-duplicate-actions@master From dd8ce9ade49520e8f73eae2a0b29ac95210f4e21 Mon Sep 17 00:00:00 2001 From: PhilWun Date: Wed, 22 Mar 2023 14:53:41 +0100 Subject: [PATCH 4/4] fix step name --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7721d1124f..9c9e98965f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,7 +123,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-cli - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub + - name: Login to GitHub registry uses: docker/login-action@v2 with: registry: ${{ env.REGISTRY }}