Skip to content

Commit

Permalink
Fix docker host bug (#329)
Browse files Browse the repository at this point in the history
* Update entrypoint.sh

should be a value not boolean

* Update action.yaml

add example

* Update README.md
  • Loading branch information
admiralAwkbar authored Apr 5, 2024
1 parent 840deb4 commit 207cd40
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ Following inputs can be used as `step.with` keys:
| `trivy-config` | String | | Path to trivy.yaml config |
| `github-pat` | String | | Authentication token to enable sending SBOM scan results to GitHub Dependency Graph. Can be either a GitHub Personal Access Token (PAT) or GITHUB_TOKEN |
| `limit-severities-for-sarif` | Boolean | false | By default *SARIF* format enforces output of all vulnerabilities regardless of configured severities. To override this behavior set this parameter to **true** |
| `docker-host` | String | | By default it is set to `unix://var/run/docker.sock`, but can be updated to help with containerized infrastructure values |

### Environment variables
You can use [Trivy environment variables][trivy-env] to set the necessary options (including flags that are not supported by [Inputs](#inputs), such as `--secret-config`).
Expand Down
4 changes: 2 additions & 2 deletions action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ inputs:
description: 'limit severities for SARIF format'
required: false
docker-host:
description: 'unix domain socket path to use for docker scanning'
description: 'unix domain socket path to use for docker scanning, ex. unix:///var/run/docker.sock'
required: false

runs:
Expand Down Expand Up @@ -126,4 +126,4 @@ runs:
- '-v ${{ inputs.trivy-config }}'
- '-x ${{ inputs.tf-vars }}'
- '-z ${{ inputs.limit-severities-for-sarif }}'
- '-y ${{ inputs.docker-host }}'
- '-y ${{ inputs.docker-host }}'
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ if [ "$hideProgress" == "true" ];then
ARGS="$ARGS --quiet"
SARIF_ARGS="$SARIF_ARGS --quiet"
fi
if [ "$dockerHost" == "true" ];then
if [ $dockerHost ];then
ARGS="$ARGS --docker-host $dockerHost"
fi

Expand Down

0 comments on commit 207cd40

Please sign in to comment.