Skip to content

Commit b6e697e

Browse files
committed
chore: prepare fork release test (strip DockerHub/ECR, retarget GHCR)
1 parent 05508a5 commit b6e697e

3 files changed

Lines changed: 18 additions & 83 deletions

File tree

.github/workflows/release.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ jobs:
1212
goreleaser_config: goreleaser.yml
1313
goreleaser_options: '--clean --timeout 90m'
1414
secrets:
15-
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
16-
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
17-
ECR_ACCESS_KEY_ID: ${{ secrets.ECR_ACCESS_KEY_ID }}
18-
ECR_SECRET_ACCESS_KEY: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
1915
GPG_KEY: ${{ secrets.GPG_KEY }}
2016
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
2117

.github/workflows/reusable-release.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ on:
1212
required: false
1313
type: string
1414
secrets:
15-
DOCKERHUB_USER:
16-
required: true
17-
DOCKERHUB_TOKEN:
18-
required: true
19-
ECR_ACCESS_KEY_ID:
20-
required: true
21-
ECR_SECRET_ACCESS_KEY:
22-
required: true
2315
GPG_KEY:
2416
required: true
2517
GPG_PASSPHRASE:
@@ -56,26 +48,13 @@ jobs:
5648
PLATFORMS: ${{ steps.buildx.outputs.platforms }}
5749
run: echo "${PLATFORMS}"
5850

59-
- name: Login to docker.io registry
60-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
61-
with:
62-
username: ${{ secrets.DOCKERHUB_USER }}
63-
password: ${{ secrets.DOCKERHUB_TOKEN }}
64-
6551
- name: Login to ghcr.io registry
6652
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
6753
with:
6854
registry: ghcr.io
6955
username: ${{ env.GH_USER }}
7056
password: ${{ secrets.GITHUB_TOKEN }}
7157

72-
- name: Login to ECR
73-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
74-
with:
75-
registry: public.ecr.aws
76-
username: ${{ secrets.ECR_ACCESS_KEY_ID }}
77-
password: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
78-
7958
- name: Checkout code
8059
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8160
with:

goreleaser.yml

Lines changed: 18 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,8 @@ archives:
140140

141141
dockers:
142142
- image_templates:
143-
- "docker.io/aquasec/trivy:{{ .Version }}-amd64"
144-
- "docker.io/aquasec/trivy:latest-amd64"
145-
- "ghcr.io/aquasecurity/trivy:{{ .Version }}-amd64"
146-
- "ghcr.io/aquasecurity/trivy:latest-amd64"
147-
- "public.ecr.aws/aquasecurity/trivy:latest-amd64"
148-
- "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-amd64"
143+
- "ghcr.io/DmitriyLewen/trivy:{{ .Version }}-amd64"
144+
- "ghcr.io/DmitriyLewen/trivy:latest-amd64"
149145
use: buildx
150146
goos: linux
151147
goarch: amd64
@@ -165,12 +161,8 @@ dockers:
165161
extra_files:
166162
- contrib/
167163
- image_templates:
168-
- "docker.io/aquasec/trivy:{{ .Version }}-arm64"
169-
- "docker.io/aquasec/trivy:latest-arm64"
170-
- "ghcr.io/aquasecurity/trivy:{{ .Version }}-arm64"
171-
- "ghcr.io/aquasecurity/trivy:latest-arm64"
172-
- "public.ecr.aws/aquasecurity/trivy:latest-arm64"
173-
- "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-arm64"
164+
- "ghcr.io/DmitriyLewen/trivy:{{ .Version }}-arm64"
165+
- "ghcr.io/DmitriyLewen/trivy:latest-arm64"
174166
use: buildx
175167
goos: linux
176168
goarch: arm64
@@ -190,12 +182,8 @@ dockers:
190182
extra_files:
191183
- contrib/
192184
- image_templates:
193-
- "docker.io/aquasec/trivy:{{ .Version }}-s390x"
194-
- "docker.io/aquasec/trivy:latest-s390x"
195-
- "ghcr.io/aquasecurity/trivy:{{ .Version }}-s390x"
196-
- "ghcr.io/aquasecurity/trivy:latest-s390x"
197-
- "public.ecr.aws/aquasecurity/trivy:latest-s390x"
198-
- "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-s390x"
185+
- "ghcr.io/DmitriyLewen/trivy:{{ .Version }}-s390x"
186+
- "ghcr.io/DmitriyLewen/trivy:latest-s390x"
199187
use: buildx
200188
goos: linux
201189
goarch: s390x
@@ -215,12 +203,8 @@ dockers:
215203
extra_files:
216204
- contrib/
217205
- image_templates:
218-
- "docker.io/aquasec/trivy:{{ .Version }}-ppc64le"
219-
- "docker.io/aquasec/trivy:latest-ppc64le"
220-
- "ghcr.io/aquasecurity/trivy:{{ .Version }}-ppc64le"
221-
- "ghcr.io/aquasecurity/trivy:latest-ppc64le"
222-
- "public.ecr.aws/aquasecurity/trivy:latest-ppc64le"
223-
- "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-ppc64le"
206+
- "ghcr.io/DmitriyLewen/trivy:{{ .Version }}-ppc64le"
207+
- "ghcr.io/DmitriyLewen/trivy:latest-ppc64le"
224208
use: buildx
225209
goos: linux
226210
goarch: ppc64le
@@ -241,42 +225,18 @@ dockers:
241225
- contrib/
242226

243227
docker_manifests:
244-
- name_template: 'aquasec/trivy:{{ .Version }}'
228+
- name_template: 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}'
245229
image_templates:
246-
- 'aquasec/trivy:{{ .Version }}-amd64'
247-
- 'aquasec/trivy:{{ .Version }}-arm64'
248-
- 'aquasec/trivy:{{ .Version }}-s390x'
249-
- 'aquasec/trivy:{{ .Version }}-ppc64le'
250-
- name_template: 'ghcr.io/aquasecurity/trivy:{{ .Version }}'
230+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-amd64'
231+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-arm64'
232+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-s390x'
233+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-ppc64le'
234+
- name_template: 'ghcr.io/DmitriyLewen/trivy:latest'
251235
image_templates:
252-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-amd64'
253-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-arm64'
254-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-s390x'
255-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-ppc64le'
256-
- name_template: 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}'
257-
image_templates:
258-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-amd64'
259-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-arm64'
260-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-s390x'
261-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-ppc64le'
262-
- name_template: 'aquasec/trivy:latest'
263-
image_templates:
264-
- 'aquasec/trivy:{{ .Version }}-amd64'
265-
- 'aquasec/trivy:{{ .Version }}-arm64'
266-
- 'aquasec/trivy:{{ .Version }}-s390x'
267-
- 'aquasec/trivy:{{ .Version }}-ppc64le'
268-
- name_template: 'ghcr.io/aquasecurity/trivy:latest'
269-
image_templates:
270-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-amd64'
271-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-arm64'
272-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-s390x'
273-
- 'ghcr.io/aquasecurity/trivy:{{ .Version }}-ppc64le'
274-
- name_template: 'public.ecr.aws/aquasecurity/trivy:latest'
275-
image_templates:
276-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-amd64'
277-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-arm64'
278-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-s390x'
279-
- 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-ppc64le'
236+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-amd64'
237+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-arm64'
238+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-s390x'
239+
- 'ghcr.io/DmitriyLewen/trivy:{{ .Version }}-ppc64le'
280240

281241
signs:
282242
- cmd: cosign

0 commit comments

Comments
 (0)