diff --git a/docs/3-revenge-of-the-automated-testing/666-here-be-dragons.md b/docs/3-revenge-of-the-automated-testing/666-here-be-dragons.md index e817b9c4..63cf9c84 100644 --- a/docs/3-revenge-of-the-automated-testing/666-here-be-dragons.md +++ b/docs/3-revenge-of-the-automated-testing/666-here-be-dragons.md @@ -242,10 +242,10 @@ Let's learn how to use the **roxctl** command line. 3. We can also perform image **scans** directly. Try: ```bash - roxctl image scan --insecure-skip-tls-verify -e $ROX_ENDPOINT:443 --image quay.io/petbattle/pet-battle:latest --format pretty + roxctl image scan --insecure-skip-tls-verify -e $ROX_ENDPOINT:443 --image quay.io/petbattle/pet-battle:latest -o table ``` - We can run the **scan** command with a format of *json, csv, and pretty. default "json"*. + We can run the **scan** command with a format of *json, csv, and table. default "json"*. 4. We can try this on the **pet-battle-api** image we built using the image reference (this is printed out in the **bake** stage of our pipeline) diff --git a/docs/3-revenge-of-the-automated-testing/7a-jenkins.md b/docs/3-revenge-of-the-automated-testing/7a-jenkins.md index 0a0708fc..ad692c46 100644 --- a/docs/3-revenge-of-the-automated-testing/7a-jenkins.md +++ b/docs/3-revenge-of-the-automated-testing/7a-jenkins.md @@ -35,7 +35,7 @@ curl -k -L -H "Authorization: Bearer ${ROX_CREDS_PSW}" https://${ROX_CREDS_USR}/api/cli/download/roxctl-linux --output roxctl > /dev/null; chmod +x roxctl > /dev/null export ROX_API_TOKEN=${ROX_CREDS_PSW} - ./roxctl image scan --insecure-skip-tls-verify -e ${ROX_CREDS_USR}:443 --image image-registry.openshift-image-registry.svc:5000/${DESTINATION_NAMESPACE}/${APP_NAME}:${VERSION} --format pretty + ./roxctl image scan --insecure-skip-tls-verify -e ${ROX_CREDS_USR}:443 --image image-registry.openshift-image-registry.svc:5000/${DESTINATION_NAMESPACE}/${APP_NAME}:${VERSION} -o table ''' // BUILD & DEPLOY CHECKS @@ -70,7 +70,7 @@ sh ''' set +x export ROX_API_TOKEN=${ROX_CREDS_PSW} - ./roxctl image check --insecure-skip-tls-verify -e ${ROX_CREDS_USR}:443 --image image-registry.openshift-image-registry.svc:5000/${DESTINATION_NAMESPACE}/${APP_NAME}:${VERSION} --json --json-fail-on-policy-violations=false + ./roxctl image check --insecure-skip-tls-verify -e ${ROX_CREDS_USR}:443 --image image-registry.openshift-image-registry.svc:5000/${DESTINATION_NAMESPACE}/${APP_NAME}:${VERSION} --json ''' ``` diff --git a/docs/3-revenge-of-the-automated-testing/7b-tekton.md b/docs/3-revenge-of-the-automated-testing/7b-tekton.md index 4c13de59..b5fca820 100644 --- a/docs/3-revenge-of-the-automated-testing/7b-tekton.md +++ b/docs/3-revenge-of-the-automated-testing/7b-tekton.md @@ -24,7 +24,7 @@ description: Full name of image to scan (example -- gcr.io/rox/sample:5.0-rc1) - name: OUTPUT_FORMAT type: string - description: Output format (json | csv | pretty) + description: Output format (json | csv | table) default: json - name: WORK_DIRECTORY description: Directory to start build in (handle multiple branches) @@ -153,7 +153,7 @@ export NO_COLOR="True" curl -k -L -H "Authorization: Bearer $ROX_API_TOKEN" https://$ROX_ENDPOINT/api/cli/download/roxctl-linux --output roxctl > /dev/null; echo "Getting roxctl" chmod +x roxctl > /dev/null - ./roxctl image check --insecure-skip-tls-verify -e $ROX_ENDPOINT:443 --image $(params.IMAGE) --json --json-fail-on-policy-violations=true + ./roxctl image check --insecure-skip-tls-verify -e $ROX_ENDPOINT:443 --image $(params.IMAGE) --json if [ $? -eq 0 ]; then echo "🦕 no issues found 🦕"; exit 0;