From 543c953e1c512cfeaf95b3bbe0ea616ccef6ad50 Mon Sep 17 00:00:00 2001 From: DmitriyLewen Date: Mon, 7 Aug 2023 12:12:50 +0600 Subject: [PATCH] use dmitriylewen for images --- .github/workflows/reusable-release.yaml | 10 +-- goreleaser.yml | 92 ++++++++++--------------- 2 files changed, 41 insertions(+), 61 deletions(-) diff --git a/.github/workflows/reusable-release.yaml b/.github/workflows/reusable-release.yaml index 2afd4d949292..5c2afa112132 100644 --- a/.github/workflows/reusable-release.yaml +++ b/.github/workflows/reusable-release.yaml @@ -78,11 +78,6 @@ jobs: with: fetch-depth: 0 - - name: "free space" - run: | - echo "Free space:" - df -h - - name: Setup Go uses: actions/setup-go@v4 with: @@ -119,6 +114,11 @@ jobs: run: | rm gpg.key + - name: "free space" + run: | + echo "Free space:" + df -h + # size of `dist` dir for release is large # we need to remove unneeded binaries and archives # to avoid cases when cache will be removed due to size diff --git a/goreleaser.yml b/goreleaser.yml index b3e9dce7c571..0aecd23c7577 100644 --- a/goreleaser.yml +++ b/goreleaser.yml @@ -137,12 +137,10 @@ brews: dockers: - image_templates: - - "docker.io/aquasec/trivy:{{ .Version }}-amd64" - - "docker.io/aquasec/trivy:latest-amd64" - - "ghcr.io/aquasecurity/trivy:{{ .Version }}-amd64" - - "ghcr.io/aquasecurity/trivy:latest-amd64" - - "public.ecr.aws/aquasecurity/trivy:latest-amd64" - - "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-amd64" + - "docker.io/dmitriylewen/trivy:{{ .Version }}-amd64" + - "docker.io/dmitriylewen/trivy:latest-amd64" + - "ghcr.io/dmitriylewen/trivy:{{ .Version }}-amd64" + - "ghcr.io/dmitriylewen/trivy:latest-amd64" use: buildx goos: linux goarch: amd64 @@ -162,12 +160,10 @@ dockers: extra_files: - contrib/ - image_templates: - - "docker.io/aquasec/trivy:{{ .Version }}-arm64" - - "docker.io/aquasec/trivy:latest-arm64" - - "ghcr.io/aquasecurity/trivy:{{ .Version }}-arm64" - - "ghcr.io/aquasecurity/trivy:latest-arm64" - - "public.ecr.aws/aquasecurity/trivy:latest-arm64" - - "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-arm64" + - "docker.io/dmitriylewen/trivy:{{ .Version }}-arm64" + - "docker.io/dmitriylewen/trivy:latest-arm64" + - "ghcr.io/dmitriylewen/trivy:{{ .Version }}-arm64" + - "ghcr.io/dmitriylewen/trivy:latest-arm64" use: buildx goos: linux goarch: arm64 @@ -187,12 +183,10 @@ dockers: extra_files: - contrib/ - image_templates: - - "docker.io/aquasec/trivy:{{ .Version }}-s390x" - - "docker.io/aquasec/trivy:latest-s390x" - - "ghcr.io/aquasecurity/trivy:{{ .Version }}-s390x" - - "ghcr.io/aquasecurity/trivy:latest-s390x" - - "public.ecr.aws/aquasecurity/trivy:latest-s390x" - - "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-s390x" + - "docker.io/dmitriylewen/trivy:{{ .Version }}-s390x" + - "docker.io/dmitriylewen/trivy:latest-s390x" + - "ghcr.io/dmitriylewen/trivy:{{ .Version }}-s390x" + - "ghcr.io/dmitriylewen/trivy:latest-s390x" use: buildx goos: linux goarch: s390x @@ -212,12 +206,10 @@ dockers: extra_files: - contrib/ - image_templates: - - "docker.io/aquasec/trivy:{{ .Version }}-ppc64le" - - "docker.io/aquasec/trivy:latest-ppc64le" - - "ghcr.io/aquasecurity/trivy:{{ .Version }}-ppc64le" - - "ghcr.io/aquasecurity/trivy:latest-ppc64le" - - "public.ecr.aws/aquasecurity/trivy:latest-ppc64le" - - "public.ecr.aws/aquasecurity/trivy:{{ .Version }}-ppc64le" + - "docker.io/dmitriylewen/trivy:{{ .Version }}-ppc64le" + - "docker.io/dmitriylewen/trivy:latest-ppc64le" + - "ghcr.io/dmitriylewen/trivy:{{ .Version }}-ppc64le" + - "ghcr.io/dmitriylewen/trivy:latest-ppc64le" use: buildx goos: linux goarch: ppc64le @@ -238,42 +230,30 @@ dockers: - contrib/ docker_manifests: - - name_template: 'aquasec/trivy:{{ .Version }}' + - name_template: 'dmitriylewen/trivy:{{ .Version }}' image_templates: - - 'aquasec/trivy:{{ .Version }}-amd64' - - 'aquasec/trivy:{{ .Version }}-arm64' - - 'aquasec/trivy:{{ .Version }}-s390x' - - 'aquasec/trivy:{{ .Version }}-ppc64le' - - name_template: 'ghcr.io/aquasecurity/trivy:{{ .Version }}' + - 'dmitriylewen/trivy:{{ .Version }}-amd64' + - 'dmitriylewen/trivy:{{ .Version }}-arm64' + - 'dmitriylewen/trivy:{{ .Version }}-s390x' + - 'dmitriylewen/trivy:{{ .Version }}-ppc64le' + - name_template: 'ghcr.io/dmitriylewen/trivy:{{ .Version }}' image_templates: - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-amd64' - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-arm64' - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-s390x' - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-ppc64le' - - name_template: 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-amd64' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-arm64' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-s390x' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-ppc64le' + - name_template: 'dmitriylewen/trivy:latest' image_templates: - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-amd64' - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-arm64' - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-s390x' - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-ppc64le' - - name_template: 'aquasec/trivy:latest' + - 'dmitriylewen/trivy:{{ .Version }}-amd64' + - 'dmitriylewen/trivy:{{ .Version }}-arm64' + - 'dmitriylewen/trivy:{{ .Version }}-s390x' + - 'dmitriylewen/trivy:{{ .Version }}-ppc64le' + - name_template: 'ghcr.io/dmitriylewen/trivy:latest' image_templates: - - 'aquasec/trivy:{{ .Version }}-amd64' - - 'aquasec/trivy:{{ .Version }}-arm64' - - 'aquasec/trivy:{{ .Version }}-s390x' - - 'aquasec/trivy:{{ .Version }}-ppc64le' - - name_template: 'ghcr.io/aquasecurity/trivy:latest' - image_templates: - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-amd64' - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-arm64' - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-s390x' - - 'ghcr.io/aquasecurity/trivy:{{ .Version }}-ppc64le' - - name_template: 'public.ecr.aws/aquasecurity/trivy:latest' - image_templates: - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-amd64' - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-arm64' - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-s390x' - - 'public.ecr.aws/aquasecurity/trivy:{{ .Version }}-ppc64le' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-amd64' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-arm64' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-s390x' + - 'ghcr.io/dmitriylewen/trivy:{{ .Version }}-ppc64le' signs: - cmd: cosign