fix(docker): Fix missing GitHub registry image (#1645)

Signed-off-by: Owen Rumney <[email protected]>
aquasecurity · Apr 1, 2022 · bd2a207 · bd2a207
1 parent e2814c4
commit bd2a207
Show file tree

Hide file tree

Showing 4 changed files with 267 additions and 54 deletions.
diff --git a/.github/workflows/gh_release.yml b/.github/workflows/gh_release.yml
@@ -0,0 +1,44 @@
+name: tfsec github docker release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    name: releasing tfsec
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-go@v2
+        with:
+          stable: "false"
+          go-version: "1.17"
+      - run: go version
+
+      - name: Import GPG key
+        id: import_gpg
+        uses: crazy-max/[email protected]
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: Docker Login
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Release
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist -f .goreleaser_github.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -46,14 +46,3 @@ jobs:
           TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }}
           TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
           TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
-
-      # temporary hack to copy over the aquasec images to github packages
-      - name: Docker Login
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Tfsec image building for github
-        run: make clone-image-github
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -28,7 +28,7 @@ builds:
       - amd64
       - arm64
 checksum:
-  name_template: '{{ .ProjectName }}_checksums.txt'
+  name_template: "{{ .ProjectName }}_checksums.txt"
 
 snapshot:
   name_template: "{{ .Tag }}-next"
@@ -37,8 +37,8 @@ changelog:
   sort: asc
   filters:
     exclude:
-      - '^docs:'
-      - '^test:'
+      - "^docs:"
+      - "^test:"
 
 signs:
   - artifacts: binary
@@ -53,114 +53,127 @@ release:
   github:
     owner: aquasecurity
     name: tfsec
- 
+
 dockers:
   - image_templates: ["aquasec/{{ .ProjectName }}:{{ .Tag }}-amd64"]
-    ids: 
-    - tfsec
+    ids:
+      - tfsec
     dockerfile: Dockerfile
     use: buildx
     build_flag_templates:
-    - --platform=linux/amd64
+      - --platform=linux/amd64
   - image_templates: ["aquasec/{{ .ProjectName }}:{{ .Tag }}-arm64v8"]
+    ids:
+      - tfsec
     goarch: arm64
     dockerfile: Dockerfile
     use: buildx
     build_flag_templates:
-    - --platform=linux/arm64/v8
+      - --platform=linux/arm64/v8
   - image_templates: ["aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-amd64"]
-    ids: 
-    - tfsec
+    ids:
+      - tfsec
     dockerfile: Dockerfile
     use: buildx
     build_flag_templates:
-    - --platform=linux/amd64
+      - --platform=linux/amd64
   - image_templates: ["aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-arm64v8"]
+    ids:
+      - tfsec
     goarch: arm64
     dockerfile: Dockerfile
     use: buildx
     build_flag_templates:
-    - --platform=linux/arm64/v8
+      - --platform=linux/arm64/v8
   - image_templates: ["aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-amd64"]
+    ids:
+      - tfsec
     dockerfile: Dockerfile.scratch
     use: buildx
     build_flag_templates:
-    - --platform=linux/amd64
+      - --platform=linux/amd64
   - image_templates: ["aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-arm64v8"]
+    ids:
+      - tfsec
     dockerfile: Dockerfile.scratch
     use: buildx
     build_flag_templates:
-    - --platform=linux/arm64/v8
+      - --platform=linux/arm64/v8
   - image_templates: ["aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-amd64"]
+    ids:
+      - tfsec
     dockerfile: Dockerfile.ci
     use: buildx
     build_flag_templates:
-    - --platform=linux/amd64
+      - --platform=linux/amd64
   - image_templates: ["aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-arm64v8"]
+    ids:
+      - tfsec
     dockerfile: Dockerfile.ci
     use: buildx
     build_flag_templates:
-    - --platform=linux/arm64/v8
+      - --platform=linux/arm64/v8
+
 docker_manifests:
   - name_template: "aquasec/{{ .ProjectName }}:{{ .Tag }}"
     image_templates:
-    - aquasec/{{ .ProjectName }}:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}:latest"
     image_templates:
-    - aquasec/{{ .ProjectName }}:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}:v{{ .Major }}.{{ .Minor }}"
     skip_push: auto
     image_templates:
-    - aquasec/{{ .ProjectName }}:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}"
     image_templates:
-    - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-alpine:latest"
     image_templates:
-    - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-alpine:v{{ .Major }}.{{ .Minor }}"
     skip_push: auto
     image_templates:
-    - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-alpine:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}"
     image_templates:
-    - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-scratch:latest"
     image_templates:
-    - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-scratch:v{{ .Major }}.{{ .Minor }}"
     skip_push: auto
     image_templates:
-    - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-scratch:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-ci:{{ .Tag }}"
     image_templates:
-    - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-ci:latest"
     image_templates:
-    - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-amd64
   - name_template: "aquasec/{{ .ProjectName }}-ci:v{{ .Major }}.{{ .Minor }}"
     skip_push: auto
     image_templates:
-    - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-arm64v8
-    - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-amd64
+      - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-arm64v8
+      - aquasec/{{ .ProjectName }}-ci:{{ .Tag }}-amd64
 
 announce:
   slack:
     enabled: true
-    message_template: ':tada: tfsec {{.Tag}} is now available!!!! :tada:'
-    channel: '#tfsec'
-    username: 'tfsec Town Cryer'
+    message_template: ":tada: tfsec {{.Tag}} is now available!!!! :tada:"
+    channel: "#tfsec"
+    username: "tfsec Town Cryer"
 
   twitter:
     enabled: false