test revert 32 bit

DmitriyLewen · Aug 10, 2023 · 2cfbe22 · 2cfbe22
1 parent f105279
commit 2cfbe22
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 88 deletions.
diff --git a/.github/workflows/reusable-release.yaml b/.github/workflows/reusable-release.yaml
@@ -61,13 +61,6 @@ jobs:
           username: ${{ env.GH_USER }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to ECR
-        uses: docker/login-action@v2
-        with:
-          registry: public.ecr.aws
-          username: ${{ secrets.ECR_ACCESS_KEY_ID }}
-          password: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
-
       - name: Checkout code
         uses: actions/checkout@v3.5.3
         with:

diff --git a/ci/deploy-deb.sh b/ci/deploy-deb.sh
@@ -7,12 +7,14 @@ cd trivy-repo/deb
 
 for release in ${DEBIAN_RELEASES[@]} ${UBUNTU_RELEASES[@]}; do
   echo "Removing deb package of $release"
+  reprepro -A i386 remove $release trivy
   reprepro -A amd64 remove $release trivy
   reprepro -A arm64 remove $release trivy
 done
 
 for release in ${DEBIAN_RELEASES[@]} ${UBUNTU_RELEASES[@]}; do
   echo "Adding deb package to $release"
+  reprepro includedeb $release ../../dist/*Linux-32bit.deb
   reprepro includedeb $release ../../dist/*Linux-64bit.deb
   reprepro includedeb $release ../../dist/*Linux-ARM64.deb
 done

diff --git a/goreleaser.yml b/goreleaser.yml
@@ -12,6 +12,8 @@ builds:
     goos:
       - linux
     goarch:
+      - 386
+      - arm
       - amd64
       - arm64
       - s390x
@@ -31,6 +33,7 @@ builds:
       - freebsd
     goarch:
       # modernc.org/sqlite doesn't support freebsd/arm64, etc.
+      - 386
       - amd64
   - id: build-macos
     main: cmd/trivy/main.go
@@ -60,6 +63,7 @@ builds:
     goos:
       - windows
     goarch:
+      # modernc.org/sqlite doesn't support windows/386 and windows/arm, etc.
       - amd64
     goarm:
       - 7
@@ -88,6 +92,7 @@ nfpms:
       {{- else if eq .Os "dragonfly" }}DragonFlyBSD
       {{- else}}{{- title .Os }}{{ end }}-
       {{- if eq .Arch "amd64" }}64bit
+      {{- else if eq .Arch "386" }}32bit
       {{- else if eq .Arch "arm" }}ARM
       {{- else if eq .Arch "arm64" }}ARM64
       {{- else if eq .Arch "ppc64le" }}PPC64LE
@@ -112,6 +117,7 @@ archives:
       {{- else if eq .Os "dragonfly" }}DragonFlyBSD
       {{- else}}{{- .Os }}{{ end }}-
       {{- if eq .Arch "amd64" }}64bit
+      {{- else if eq .Arch "386" }}32bit
       {{- else if eq .Arch "arm" }}ARM
       {{- else if eq .Arch "arm64" }}ARM64
       {{- else if eq .Arch "ppc64le" }}PPC64LE
@@ -128,7 +134,7 @@ archives:
 brews:
   -
     tap:
-      owner: aquasecurity
+      owner: dmitriylewen
       name: homebrew-trivy
     homepage: "https://github.com/aquasecurity/trivy"
     description: "Scanner for vulnerabilities in container images, file systems, and Git repositories, as well as for configuration issues"
@@ -137,12 +143,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
@@ -160,14 +164,12 @@ dockers:
       - "--label=org.opencontainers.image.documentation=https://aquasecurity.github.io/trivy/v{{ .Version }}/"
       - "--platform=linux/amd64"
     extra_files:
-    - contrib/
+      - 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 +189,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 +212,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,66 +236,54 @@ dockers:
     - contrib/
 
 docker_manifests:
-  - name_template: 'aquasec/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 }}'
-    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 }}'
+  - name_template: 'dmitriylewen/trivy:{{ .Version }}'
     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:{{ .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:latest'
+      - '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:
-    - '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'
+      - '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:
-    - '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
-  env:
-  - COSIGN_EXPERIMENTAL=1
-  signature: "${artifact}.sig"
-  certificate: "${artifact}.pem"
-  args:
-    - "sign-blob"
-    - "--oidc-issuer=https://token.actions.githubusercontent.com"
-    - "--output-certificate=${certificate}"
-    - "--output-signature=${signature}"
-    - "${artifact}"
-    - "--yes"
-  artifacts: all
-  output: true
+  - cmd: cosign
+    env:
+      - COSIGN_EXPERIMENTAL=1
+    signature: "${artifact}.sig"
+    certificate: "${artifact}.pem"
+    args:
+      - "sign-blob"
+      - "--oidc-issuer=https://token.actions.githubusercontent.com"
+      - "--output-certificate=${certificate}"
+      - "--output-signature=${signature}"
+      - "${artifact}"
+      - "--yes"
+    artifacts: all
+    output: true
 
 docker_signs:
-- cmd: cosign
-  env:
-  - COSIGN_EXPERIMENTAL=1
-  artifacts: manifests
-  output: true
-  args:
-  - 'sign'
-  - '${artifact}'
-  - '--yes'
+  - cmd: cosign
+    env:
+      - COSIGN_EXPERIMENTAL=1
+    artifacts: manifests
+    output: true
+    args:
+      - 'sign'
+      - '${artifact}'
+      - '--yes'