diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e2d512..57bd4c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,9 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Run GoReleaser run: mise release env: diff --git a/.goreleaser.yml b/.goreleaser.yml index 89eb63c..4eed61d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,34 +12,22 @@ builds: goos: [ linux, darwin ] goarch: [ amd64, arm64 ] -dockers: - - dockerfile: dockerfiles/apiserver-mock/Dockerfile - image_templates: - - "ghcr.io/skpr/api:{{ .Major }}.{{ .Minor }}-amd64" - - "ghcr.io/skpr/api:latest-amd64" - build_flag_templates: - - "--pull" - - "--platform=linux/amd64" - use: buildx - - dockerfile: dockerfiles/apiserver-mock/Dockerfile - image_templates: - - "ghcr.io/skpr/api:{{ .Major }}.{{ .Minor }}-arm64" - - "ghcr.io/skpr/api:latest-arm64" - build_flag_templates: +dockers_v2: + - id: skpr-apiserver-mock + dockerfile: dockerfiles/apiserver-mock/Dockerfile + ids: + - skpr-apiserver-mock + images: + - ghcr.io/skpr/api + tags: + - "{{ .Major }}.{{ .Minor }}" + - "latest" + sbom: false + flags: - "--pull" - - "--platform=linux/arm64" - use: buildx - goarch: arm64 - -docker_manifests: - - name_template: "ghcr.io/skpr/api:{{ .Major }}.{{ .Minor }}" - image_templates: - - "ghcr.io/skpr/api:{{ .Major }}.{{ .Minor }}-amd64" - - "ghcr.io/skpr/api:{{ .Major }}.{{ .Minor }}-arm64" - - name_template: "ghcr.io/skpr/api:latest" - image_templates: - - "ghcr.io/skpr/api:latest-amd64" - - "ghcr.io/skpr/api:latest-arm64" + platforms: + - linux/amd64 + - linux/arm64 changelog: use: github-native diff --git a/.mise.toml b/.mise.toml index 0842cb5..77b1557 100644 --- a/.mise.toml +++ b/.mise.toml @@ -2,7 +2,7 @@ go = "1.26" "go:github.com/daixiang0/gci" = "latest" "ubi:golangci/golangci-lint" = "2.10" -"ubi:goreleaser/goreleaser" = "2.12" +"ubi:goreleaser/goreleaser" = "2.14" [env] CGO_ENABLED=0 diff --git a/dockerfiles/apiserver-mock/Dockerfile b/dockerfiles/apiserver-mock/Dockerfile index c46ee45..8c0a0c1 100644 --- a/dockerfiles/apiserver-mock/Dockerfile +++ b/dockerfiles/apiserver-mock/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:latest -COPY skpr-apiserver-mock /usr/local/bin/ +ARG TARGETPLATFORM +COPY ${TARGETPLATFORM}/skpr-apiserver-mock /usr/local/bin/ ENTRYPOINT ["/usr/local/bin/skpr-apiserver-mock"]