From 7ba05de0c8fba2dd8c8f4d13668d21487cde0ebe Mon Sep 17 00:00:00 2001 From: gaspardmoindrot Date: Thu, 27 Jul 2023 18:35:13 +0000 Subject: [PATCH 1/3] [PTFE-692] Change registry to ghcr --- .github/workflows/release.yml | 14 +++++++++----- charts/artifacts/values.yaml | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31649f0..e78a1be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,7 @@ on: description: "Is the release a GA?" required: false default: false + type: boolean jobs: release: @@ -24,12 +25,12 @@ jobs: - name: Set up Docker Buildk uses: docker/setup-buildx-action@v1 - - name: Login to Registry + - name: Login to ghcr uses: docker/login-action@v1 with: - registry: registry.scality.com - username: ${{ secrets.REGISTRY_LOGIN }} - password: ${{ secrets.REGISTRY_PASSWORD }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 @@ -37,7 +38,10 @@ jobs: context: . file: ./Dockerfile push: true - tags: "registry.scality.com/artifacts/artifacts:${{ github.event.inputs.tag }}" + build-args: | + VERSION=${{ github.event.inputs.tag }} + tags: | + ghcr.io/scality/bert-e:${{ inputs.tag }} - name: Create Release uses: softprops/action-gh-release@v1 diff --git a/charts/artifacts/values.yaml b/charts/artifacts/values.yaml index 5a63b47..2bcff40 100644 --- a/charts/artifacts/values.yaml +++ b/charts/artifacts/values.yaml @@ -49,11 +49,11 @@ cloudStorage: image: ## regitry to pull from. ## - registry: registry.scality.com + registry: ghcr.io ## repository on the registry to pull from. ## - repository: artifacts/artifacts + repository: scality/artifacts ## tag specifies the version to deploy. ## From 9db1d81d4ae28dcbf5bf9e5fe78c2c1ca21450fd Mon Sep 17 00:00:00 2001 From: gaspardmoindrot Date: Thu, 27 Jul 2023 14:54:44 -0700 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: Thomas Carmet --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e78a1be..04e1152 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: uses: docker/login-action@v1 with: registry: ghcr.io - username: ${{ github.repository_owner }} + username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push @@ -39,9 +39,9 @@ jobs: file: ./Dockerfile push: true build-args: | - VERSION=${{ github.event.inputs.tag }} + VERSION=${{ inputs.tag }} tags: | - ghcr.io/scality/bert-e:${{ inputs.tag }} + ghcr.io/scality/artifacts:${{ inputs.tag }} - name: Create Release uses: softprops/action-gh-release@v1 From 00e056d9e7ade01f0cd40ee2d3362b8eab2b3ff9 Mon Sep 17 00:00:00 2001 From: gaspardmoindrot Date: Fri, 28 Jul 2023 14:49:24 -0700 Subject: [PATCH 3/3] Update .github/workflows/release.yml Co-authored-by: Thomas Carmet --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04e1152..0234dd0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,8 +38,6 @@ jobs: context: . file: ./Dockerfile push: true - build-args: | - VERSION=${{ inputs.tag }} tags: | ghcr.io/scality/artifacts:${{ inputs.tag }}