From 5e7733850773160a133eaac592ee97b4104edb38 Mon Sep 17 00:00:00 2001 From: Marc Campbell Date: Fri, 26 Jul 2019 18:51:18 +0000 Subject: [PATCH] Release --- Makefile | 3 +-- deploy/.goreleaser.yml | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 8befa5b96..c3e9ae555 100644 --- a/Makefile +++ b/Makefile @@ -82,9 +82,8 @@ snapshot-release: docker push replicated/troubleshoot-manager:alpha .PHONY: release -release: export GITHUB_TOKEN=$(GITHUB_TOKEN_TROUBLESHOOT) release: - curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --config deploy/.goreleaser.yml + curl -sL https://git.io/goreleaser | GITHUB_TOKEN=$$GITHUB_TOKEN_TROUBLESHOOT bash -s -- --rm-dist --config deploy/.goreleaser.yml .PHONY: local-release local-release: diff --git a/deploy/.goreleaser.yml b/deploy/.goreleaser.yml index f6efe4d3d..735cb5b65 100644 --- a/deploy/.goreleaser.yml +++ b/deploy/.goreleaser.yml @@ -84,20 +84,29 @@ archives: dockers: - dockerfile: ./deploy/Dockerfile.troubleshoot image_templates: - - "replicated/troubleshoot:alpha" + - "replicated/troubleshoot:latest" + - "replicated/troubleshoot:{{ .Major }}" + - "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}" + - "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" binaries: - collector - troubleshoot - preflight - dockerfile: ./deploy/Dockerfile.troubleshoot image_templates: - - "replicated/preflight:alpha" + - "replicated/preflight:latest" + - "replicated/preflight:{{ .Major }}" + - "replicated/preflight:{{ .Major }}.{{ .Minor }}" + - "replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" binaries: - collector - troubleshoot - preflight - dockerfile: ./deploy/Dockerfile.manager image_templates: - - "replicated/troubleshoot-manager:alpha" + - "replicated/troubleshoot-manager:latest" + - "replicated/troubleshoot-manager:{{ .Major }}" + - "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}" + - "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" binaries: - manager