From affc7c6476970ed761318c11f364b0b410a07fc1 Mon Sep 17 00:00:00 2001 From: David VIEJO Date: Mon, 10 Feb 2025 10:25:24 +0100 Subject: [PATCH] Use ghcr.io instead of quay.io Signed-off-by: David VIEJO --- .github/workflows/goreleaser-beta.yml | 11 ++++++++--- .github/workflows/goreleaser.yml | 11 ++++++++--- .goreleaser.yml | 4 ++-- CONTRIBUTING.md | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/goreleaser-beta.yml b/.github/workflows/goreleaser-beta.yml index e32c574a..b2656a1c 100644 --- a/.github/workflows/goreleaser-beta.yml +++ b/.github/workflows/goreleaser-beta.yml @@ -5,6 +5,11 @@ on: tags: - 'v[0-9]+.[0-9]+.[0-9]+-beta[0-9]+' +permissions: + contents: write # for goreleaser to create releases + packages: write # for pushing to ghcr.io + id-token: write # for signing the images + jobs: goreleaser: runs-on: ubuntu-latest @@ -20,9 +25,9 @@ jobs: - name: Docker Login uses: docker/login-action@v1 with: - registry: quay.io - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 25a9cd17..2532cac6 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -5,6 +5,11 @@ on: tags: - 'v[0-9]+.[0-9]+.[0-9]+' +permissions: + contents: write # for goreleaser to create releases + packages: write # for pushing to ghcr.io + id-token: write # for signing the images + jobs: goreleaser: runs-on: ubuntu-latest @@ -20,9 +25,9 @@ jobs: - name: Docker Login uses: docker/login-action@v1 with: - registry: quay.io - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 diff --git a/.goreleaser.yml b/.goreleaser.yml index 4adcabae..0ed83dce 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -65,8 +65,8 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - "quay.io/kfsoftware/hlf-operator:{{ .Tag }}" - - "quay.io/kfsoftware/hlf-operator:latest" + - "ghcr.io/hyperledger-bevel/bevel-operator-fabric:{{ .Tag }}" + - "ghcr.io/hyperledger-bevel/bevel-operator-fabric:latest" extra_files: - charts - LICENSE diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2724c7ad..8ce8b6b5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ ### Install controller-gen ```bash -go install sigs.k8s.io/controller-tools/cmd/controller-gen@0.16.4 +go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.4 ```