Skip to content

Commit 48faf0c

Browse files
authored
Revert "Add ghcr to package releases (#848)" (#868)
This reverts commit 233966d.
1 parent fbbcf87 commit 48faf0c

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ endif
121121
.PHONY: release
122122
release: export GITHUB_TOKEN = $(shell echo ${GITHUB_TOKEN_TROUBLESHOOT})
123123
release:
124-
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --config deploy/.goreleaser.yaml
124+
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --config deploy/.goreleaser.yml
125125

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

deploy/.goreleaser.yaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -125,28 +125,20 @@ archives:
125125
dockers:
126126
- dockerfile: ./deploy/Dockerfile.troubleshoot
127127
image_templates:
128-
- "docker.io/replicated/troubleshoot:latest"
129-
- "docker.io/replicated/troubleshoot:{{ .Major }}"
130-
- "docker.io/replicated/troubleshoot:{{ .Major }}.{{ .Minor }}"
131-
- "docker.io/replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
132-
- "ghcr.io/replicatedhq/troubleshoot:latest"
133-
- "ghcr.io/replicatedhq/troubleshoot:{{ .Major }}"
134-
- "ghcr.io/replicatedhq/troubleshoot:{{ .Major }}.{{ .Minor }}"
135-
- "ghcr.io/replicatedhq/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
128+
- "replicated/troubleshoot:latest"
129+
- "replicated/troubleshoot:{{ .Major }}"
130+
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}"
131+
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
136132
ids:
137133
- support-bundle
138134
- preflight
139135
- collect
140136
- dockerfile: ./deploy/Dockerfile.troubleshoot
141137
image_templates:
142-
- "docker.io/replicated/preflight:latest"
143-
- "docker.io/replicated/preflight:{{ .Major }}"
144-
- "docker.io/replicated/preflight:{{ .Major }}.{{ .Minor }}"
145-
- "docker.io/replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
146-
- "ghcr.io/replicatedhq/preflight:latest"
147-
- "ghcr.io/replicatedhq/preflight:{{ .Major }}"
148-
- "ghcr.io/replicatedhq/preflight:{{ .Major }}.{{ .Minor }}"
149-
- "ghcr.io/replicatedhq/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
138+
- "replicated/preflight:latest"
139+
- "replicated/preflight:{{ .Major }}"
140+
- "replicated/preflight:{{ .Major }}.{{ .Minor }}"
141+
- "replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
150142
ids:
151143
- support-bundle
152144
- preflight

0 commit comments

Comments
 (0)