Merge branch 'master' into update-plugin-links-v0.179.0

aquasecurity · Aug 28, 2024 · 4413c04 · 4413c04
2 parents 95e4d9f + b44700b
commit 4413c04
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 75 deletions.
diff --git a/.github/plugin_template.yaml b/.github/plugin_template.yaml
@@ -1,8 +1,9 @@
 name: "aqua"
 repository: github.com/aquasecurity/trivy-plugin-aqua
 version: "PLACEHOLDERVERSION"
-usage: trivy aqua <srcPath>
-description: A Trivy plugin that sends results to Aqua.
+maintainer: aquasecurity
+summary: Send results to Aqua Security
+description: A plugin for integration with Aqua Security SaaS platform
 platforms:
   - selector: # optional
       os: linux

diff --git a/.github/workflows/pr-merged.yml b/.github/workflows/pr-merged.yml
@@ -35,18 +35,18 @@ jobs:
         docker tag aquasec/aqua-scanner:${{ env.new_version }}-arm64 aquasec/aqua-scanner:latest-arm64
         docker push aquasec/aqua-scanner:latest-arm64
         
-        #docker pull aquasec/aqua-scanner:${{ env.new_version }}-amd64-limited
-        #docker tag aquasec/aqua-scanner:${{ env.new_version }}-amd64-limited aquasec/aqua-scanner:latest-amd64-limited
-        #docker push aquasec/aqua-scanner:latest-amd64-limited
+        docker pull aquasec/aqua-scanner:${{ env.new_version }}-amd64-limited
+        docker tag aquasec/aqua-scanner:${{ env.new_version }}-amd64-limited aquasec/aqua-scanner:latest-amd64-limited
+        docker push aquasec/aqua-scanner:latest-amd64-limited
         
-        #docker pull aquasec/aqua-scanner:${{ env.new_version }}-arm64-limited
-        #docker tag aquasec/aqua-scanner:${{ env.new_version }}-arm64-limited aquasec/aqua-scanner:latest-arm64-limited
-        #docker push aquasec/aqua-scanner:latest-arm64-limited
+        docker pull aquasec/aqua-scanner:${{ env.new_version }}-arm64-limited
+        docker tag aquasec/aqua-scanner:${{ env.new_version }}-arm64-limited aquasec/aqua-scanner:latest-arm64-limited
+        docker push aquasec/aqua-scanner:latest-arm64-limited
         docker manifest create aquasec/aqua-scanner:latest aquasec/aqua-scanner:latest-amd64 aquasec/aqua-scanner:latest-arm64
         docker manifest push aquasec/aqua-scanner:latest
         
-        #docker manifest create aquasec/aqua-scanner:latest-limited aquasec/aqua-scanner:latest-amd64-limited aquasec/aqua-scanner:latest-arm64-limited
-        #docker manifest push aquasec/aqua-scanner:latest-limited
+        docker manifest create aquasec/aqua-scanner:latest-limited aquasec/aqua-scanner:latest-amd64-limited aquasec/aqua-scanner:latest-arm64-limited
+        docker manifest push aquasec/aqua-scanner:latest-limited
     - name: DockerHub description update
       uses: peter-evans/dockerhub-description@v3
       with:

diff --git a/.github/workflows/retag-latest-version.yml b/.github/workflows/retag-latest-version.yml
@@ -0,0 +1,40 @@
+name: Re-tag latest version
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to re-tag"
+        required: true
+
+jobs:
+  Update-images:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to docker.io registry
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.ARGON_DOCKERHUB_USER }}
+          password: ${{ secrets.ARGON_DOCKERHUB_TOKEN }}
+      - name: Change image versions to latest
+        run: |
+          docker pull aquasec/aqua-scanner:${{ inputs.version }}-amd64
+          docker tag aquasec/aqua-scanner:${{ inputs.version }}-amd64 aquasec/aqua-scanner:latest-amd64
+          docker push aquasec/aqua-scanner:latest-amd64
+
+          docker pull aquasec/aqua-scanner:${{ inputs.version }}-arm64
+          docker tag aquasec/aqua-scanner:${{ inputs.version }}-arm64 aquasec/aqua-scanner:latest-arm64
+          docker push aquasec/aqua-scanner:latest-arm64
+
+          docker pull aquasec/aqua-scanner:${{ inputs.version }}-amd64-limited
+          docker tag aquasec/aqua-scanner:${{ inputs.version }}-amd64-limited aquasec/aqua-scanner:latest-amd64-limited
+          docker push aquasec/aqua-scanner:latest-amd64-limited
+
+          docker pull aquasec/aqua-scanner:${{ inputs.version }}-arm64-limited
+          docker tag aquasec/aqua-scanner:${{ inputs.version }}-arm64-limited aquasec/aqua-scanner:latest-arm64-limited
+          docker push aquasec/aqua-scanner:latest-arm64-limited
+          
+          docker manifest create aquasec/aqua-scanner:latest aquasec/aqua-scanner:latest-amd64 aquasec/aqua-scanner:latest-arm64
+          docker manifest push aquasec/aqua-scanner:latest
+
+          docker manifest create aquasec/aqua-scanner:latest-limited aquasec/aqua-scanner:latest-amd64-limited aquasec/aqua-scanner:latest-arm64-limited
+          docker manifest push aquasec/aqua-scanner:latest-limited