Skip to content

Commit

Permalink
Revert "Add ghcr to package releases (#848)" (#868)
Browse files Browse the repository at this point in the history
This reverts commit 233966d.
  • Loading branch information
xavpaice authored Nov 22, 2022
1 parent fbbcf87 commit 48faf0c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ endif
.PHONY: release
release: export GITHUB_TOKEN = $(shell echo ${GITHUB_TOKEN_TROUBLESHOOT})
release:
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --config deploy/.goreleaser.yaml
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --config deploy/.goreleaser.yml

.PHONY: snapshot-release
snapshot-release:
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --snapshot --config deploy/.goreleaser.snapshot.yaml
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --snapshot --config deploy/.goreleaser.snapshot.yml
docker push replicated/troubleshoot:alpha
docker push replicated/preflight:alpha

Expand Down
24 changes: 8 additions & 16 deletions deploy/.goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,28 +125,20 @@ archives:
dockers:
- dockerfile: ./deploy/Dockerfile.troubleshoot
image_templates:
- "docker.io/replicated/troubleshoot:latest"
- "docker.io/replicated/troubleshoot:{{ .Major }}"
- "docker.io/replicated/troubleshoot:{{ .Major }}.{{ .Minor }}"
- "docker.io/replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "ghcr.io/replicatedhq/troubleshoot:latest"
- "ghcr.io/replicatedhq/troubleshoot:{{ .Major }}"
- "ghcr.io/replicatedhq/troubleshoot:{{ .Major }}.{{ .Minor }}"
- "ghcr.io/replicatedhq/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "replicated/troubleshoot:latest"
- "replicated/troubleshoot:{{ .Major }}"
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}"
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
ids:
- support-bundle
- preflight
- collect
- dockerfile: ./deploy/Dockerfile.troubleshoot
image_templates:
- "docker.io/replicated/preflight:latest"
- "docker.io/replicated/preflight:{{ .Major }}"
- "docker.io/replicated/preflight:{{ .Major }}.{{ .Minor }}"
- "docker.io/replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "ghcr.io/replicatedhq/preflight:latest"
- "ghcr.io/replicatedhq/preflight:{{ .Major }}"
- "ghcr.io/replicatedhq/preflight:{{ .Major }}.{{ .Minor }}"
- "ghcr.io/replicatedhq/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
- "replicated/preflight:latest"
- "replicated/preflight:{{ .Major }}"
- "replicated/preflight:{{ .Major }}.{{ .Minor }}"
- "replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
ids:
- support-bundle
- preflight
Expand Down

0 comments on commit 48faf0c

Please sign in to comment.