From b8339d9e30b78221210b1a9028aee1bc37552c6a Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Thu, 18 Nov 2021 10:54:49 -0500 Subject: [PATCH] goreleaser: add dockerhub registry prefix and setup qemu --- .github/workflows/goreleaser.yml | 5 +++ .goreleaser.yml | 66 ++++++++++++++++---------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 8d641b35b..43b455ed2 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -12,6 +12,8 @@ permissions: jobs: goreleaser: runs-on: ubuntu-latest + env: + DOCKER_CLI_EXPERIMENTAL: enabled steps: - name: Checkout uses: actions/checkout@v2 @@ -42,6 +44,9 @@ jobs: username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 diff --git a/.goreleaser.yml b/.goreleaser.yml index ab596241f..15612ec09 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -38,9 +38,9 @@ changelog: dockers: - image_templates: - - "charmcli/soft-serve:latest-amd64" - - "charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-amd64" - - "charmcli/soft-serve:v{{ .Version }}-amd64" + - "docker.io/charmcli/soft-serve:latest-amd64" + - "docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-amd64" + - "docker.io/charmcli/soft-serve:v{{ .Version }}-amd64" - "ghcr.io/charmbracelet/soft-serve:latest-amd64" - "ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-amd64" - "ghcr.io/charmbracelet/soft-serve:v{{ .Version }}-amd64" @@ -59,9 +59,9 @@ dockers: dockerfile: Dockerfile use: buildx - image_templates: - - "charmcli/soft-serve:latest-i386" - - "charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-i386" - - "charmcli/soft-serve:v{{ .Version }}-i386" + - "docker.io/charmcli/soft-serve:latest-i386" + - "docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-i386" + - "docker.io/charmcli/soft-serve:v{{ .Version }}-i386" - "ghcr.io/charmbracelet/soft-serve:latest-i386" - "ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-i386" - "ghcr.io/charmbracelet/soft-serve:v{{ .Version }}-i386" @@ -80,9 +80,9 @@ dockers: dockerfile: Dockerfile use: buildx - image_templates: - - "charmcli/soft-serve:latest-arm64" - - "charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-arm64" - - "charmcli/soft-serve:v{{ .Version }}-arm64" + - "docker.io/charmcli/soft-serve:latest-arm64" + - "docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-arm64" + - "docker.io/charmcli/soft-serve:v{{ .Version }}-arm64" - "ghcr.io/charmbracelet/soft-serve:latest-arm64" - "ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-arm64" - "ghcr.io/charmbracelet/soft-serve:v{{ .Version }}-arm64" @@ -101,9 +101,9 @@ dockers: dockerfile: Dockerfile use: buildx - image_templates: - - "charmcli/soft-serve:latest-armv6" - - "charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv6" - - "charmcli/soft-serve:v{{ .Version }}-armv6" + - "docker.io/charmcli/soft-serve:latest-armv6" + - "docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv6" + - "docker.io/charmcli/soft-serve:v{{ .Version }}-armv6" - "ghcr.io/charmbracelet/soft-serve:latest-armv6" - "ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-armv6" - "ghcr.io/charmbracelet/soft-serve:v{{ .Version }}-armv6" @@ -123,9 +123,9 @@ dockers: dockerfile: Dockerfile use: buildx - image_templates: - - "charmcli/soft-serve:latest-armv7" - - "charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv7" - - "charmcli/soft-serve:v{{ .Version }}-armv7" + - "docker.io/charmcli/soft-serve:latest-armv7" + - "docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv7" + - "docker.io/charmcli/soft-serve:v{{ .Version }}-armv7" - "ghcr.io/charmbracelet/soft-serve:latest-armv7" - "ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-armv7" - "ghcr.io/charmbracelet/soft-serve:v{{ .Version }}-armv7" @@ -146,13 +146,13 @@ dockers: use: buildx docker_manifests: - - name_template: charmcli/soft-serve:latest + - name_template: docker.io/charmcli/soft-serve:latest image_templates: - - charmcli/soft-serve:latest-amd64 - - charmcli/soft-serve:latest-arm64 - - charmcli/soft-serve:latest-armv6 - - charmcli/soft-serve:latest-armv7 - - charmcli/soft-serve:latest-i386 + - docker.io/charmcli/soft-serve:latest-amd64 + - docker.io/charmcli/soft-serve:latest-arm64 + - docker.io/charmcli/soft-serve:latest-armv6 + - docker.io/charmcli/soft-serve:latest-armv7 + - docker.io/charmcli/soft-serve:latest-i386 - name_template: ghcr.io/charmbracelet/soft-serve:latest image_templates: - ghcr.io/charmbracelet/soft-serve:latest-amd64 @@ -160,13 +160,13 @@ docker_manifests: - ghcr.io/charmbracelet/soft-serve:latest-armv6 - ghcr.io/charmbracelet/soft-serve:latest-armv7 - ghcr.io/charmbracelet/soft-serve:latest-i386 - - name_template: charmcli/soft-serve:v{{ .Major }}.{{ .Minor }} + - name_template: docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }} image_templates: - - charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-amd64 - - charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-arm64 - - charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv6 - - charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv7 - - charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-i386 + - docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-amd64 + - docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-arm64 + - docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv6 + - docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-armv7 + - docker.io/charmcli/soft-serve:v{{ .Major }}.{{ .Minor }}-i386 - name_template: ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }} image_templates: - ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-amd64 @@ -174,13 +174,13 @@ docker_manifests: - ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-armv6 - ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-armv7 - ghcr.io/charmbracelet/soft-serve:v{{ .Major }}.{{ .Minor }}-i386 - - name_template: charmcli/soft-serve:v{{ .Version }} + - name_template: docker.io/charmcli/soft-serve:v{{ .Version }} image_templates: - - charmcli/soft-serve:v{{ .Version }}-amd64 - - charmcli/soft-serve:v{{ .Version }}-arm64 - - charmcli/soft-serve:v{{ .Version }}-armv6 - - charmcli/soft-serve:v{{ .Version }}-armv7 - - charmcli/soft-serve:v{{ .Version }}-i386 + - docker.io/charmcli/soft-serve:v{{ .Version }}-amd64 + - docker.io/charmcli/soft-serve:v{{ .Version }}-arm64 + - docker.io/charmcli/soft-serve:v{{ .Version }}-armv6 + - docker.io/charmcli/soft-serve:v{{ .Version }}-armv7 + - docker.io/charmcli/soft-serve:v{{ .Version }}-i386 - name_template: ghcr.io/charmbracelet/soft-serve:v{{ .Version }} image_templates: - ghcr.io/charmbracelet/soft-serve:v{{ .Version }}-amd64