Skip to content

Commit

Permalink
Merge branch 'master' into update-pipelines-flag-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
tzurielweisberg authored Oct 5, 2023
2 parents 687c9b2 + b9ad215 commit 9117702
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 6 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/pr-merged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +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 }}-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
- name: DockerHub description update
uses: peter-evans/dockerhub-description@v3
with:
Expand Down
28 changes: 28 additions & 0 deletions README-dockerhub.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,34 @@ podman run --rm \

When working within CI environment, it's important to include the Source Code Management (SCM) tokens for pull requests. You can find additional guidance and details on this matter within our platform for your reference about each SCM.

# aqua-scanner limited Tag

We provide a dedicated limited tag, for running the aqua-scanner on a limited user.

## Running limited tag on Azure DevOps pipeline

To use this tag effectively in Azure DevOps Pipelines, follow the steps below ([Azure documentation](https://learn.microsoft.com/en-us/azure/devops/pipelines/process/container-phases?view=azure-devops&tabs=yaml#linux-based-containers)), consider the following Azure DevOps pipeline example (with the -u 0 option):

```yaml
trigger:
- main

container:
image: aquasec/aqua-scanner:limited
options: -u 0
env:
AQUA_KEY: $(AQUA_KEY)
AQUA_SECRET: $(AQUA_SECRET)
AZURE_TOKEN: $(AZURE_TOKEN)
TRIVY_RUN_AS_PLUGIN: aqua
steps:
- checkout: self
fetchDepth: 0
- script: |
trivy fs --scanners config,vuln,secret .
displayName: Aqua scanner
```
## Compatibility
The plugin is designed for Docker environments and is compatible with Linux containers.
Expand Down
12 changes: 6 additions & 6 deletions plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
name: "aqua"
repository: github.com/aquasecurity/trivy-plugin-aqua
version: "v0.144.0"
version: "v0.147.7"
usage: trivy aqua <srcPath>
description: A Trivy plugin that sends results to Aqua.
platforms:
- selector: # optional
os: linux
arch: amd64
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.144.0/linux_amd64_v0.144.0.tar.gz
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.147.7/linux_amd64_v0.147.7.tar.gz
bin: ./aqua
- selector:
os: linux
arch: arm64
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.144.0/linux_arm64_v0.144.0.tar.gz
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.147.7/linux_arm64_v0.147.7.tar.gz
bin: ./aqua
- selector:
os: darwin
arch: amd64
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.144.0/darwin_amd64_v0.144.0.tar.gz
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.147.7/darwin_amd64_v0.147.7.tar.gz
bin: ./aqua
- selector:
os: darwin
arch: arm64
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.144.0/darwin_arm64_v0.144.0.tar.gz
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.147.7/darwin_arm64_v0.147.7.tar.gz
bin: ./aqua
- selector:
os: windows
arch: amd64
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.144.0/windows_amd64_v0.144.0.tar.gz
uri: https://github.com/aquasecurity/trivy-plugin-aqua/releases/download/v0.147.7/windows_amd64_v0.147.7.tar.gz
bin: ./aqua

0 comments on commit 9117702

Please sign in to comment.