From c0d87b351c88ec023fe1a8a8e570b474b98e84e7 Mon Sep 17 00:00:00 2001 From: Adam Hamrick Date: Fri, 24 Jan 2025 16:50:01 -0500 Subject: [PATCH] Adds manifest for Goreleaser --- parrot/.goreleaser.yaml | 12 ++++++++---- parrot/Dockerfile | 4 ++-- parrot/Makefile | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/parrot/.goreleaser.yaml b/parrot/.goreleaser.yaml index 14867fff3..ea860e782 100644 --- a/parrot/.goreleaser.yaml +++ b/parrot/.goreleaser.yaml @@ -31,8 +31,7 @@ dockers: goos: linux goarch: amd64 image_templates: - - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}' - - '{{ .Env.IMG_PRE }}/parrot:latest' + - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-amd64' build_flag_templates: - --platform=linux/amd64 - --pull @@ -45,7 +44,6 @@ dockers: goarch: arm64 image_templates: - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-arm64' - - '{{ .Env.IMG_PRE }}/parrot:latest-arm64' build_flag_templates: - --platform=linux/arm64 - --pull @@ -54,6 +52,12 @@ dockers: - --label=org.opencontainers.image.revision={{.FullCommit}} - --label=org.opencontainers.image.version={{.Version}} +docker_manifests: + - name_template: '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}' + image_templates: + - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-amd64' + - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-arm64' + before: hooks: - - cd parrot && go mod tidy \ No newline at end of file + - sh -c "cd parrot && go mod tidy" \ No newline at end of file diff --git a/parrot/Dockerfile b/parrot/Dockerfile index f0f10b02e..d65f0514a 100644 --- a/parrot/Dockerfile +++ b/parrot/Dockerfile @@ -1,3 +1,3 @@ FROM scratch -COPY parrotserver /parrotserver -ENTRYPOINT [ "parrotserver", "-port", "9090", "-t" ] \ No newline at end of file +COPY parrot /parrot +ENTRYPOINT [ "parrot", "-port", "9090", "-t" ] \ No newline at end of file diff --git a/parrot/Makefile b/parrot/Makefile index 478087dec..2210cc9d8 100644 --- a/parrot/Makefile +++ b/parrot/Makefile @@ -34,4 +34,4 @@ build: .PHONY: goreleaser goreleaser: - cd .. && goreleaser build --snapshot --clean -f ./parrot/.goreleaser.yaml \ No newline at end of file + cd .. && goreleaser release --snapshot --clean -f ./parrot/.goreleaser.yaml \ No newline at end of file