fixing the issue 52 with image scan using roxctl

rh-impact · Feb 25, 2022 · 1b7f07a · 1b7f07a
1 parent 69d44db
commit 1b7f07a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/bootstrap/roles/ocp4-install-pipelines/templates/pipeline-build-dev.yaml.j2 b/bootstrap/roles/ocp4-install-pipelines/templates/pipeline-build-dev.yaml.j2
@@ -151,7 +151,7 @@ spec:
     - name: rox_central_endpoint
       value: roxsecrets
     - name: output_format
-      value: pretty
+      value: table
     - name: image_digest
       value: $(tasks.build-image.results.IMAGE_DIGEST)
   - name: image-check

diff --git a/bootstrap/roles/ocp4-install-pipelines/templates/pipeline-build-stage.yaml.j2 b/bootstrap/roles/ocp4-install-pipelines/templates/pipeline-build-stage.yaml.j2
@@ -151,7 +151,7 @@ spec:
     - name: rox_central_endpoint
       value: roxsecrets
     - name: output_format
-      value: pretty
+      value: table
     - name: image_digest
       value: $(tasks.build-image.results.IMAGE_DIGEST)
   - name: image-check

diff --git a/bootstrap/roles/ocp4-install-pipelines/templates/task-image-scan-task.yaml.j2 b/bootstrap/roles/ocp4-install-pipelines/templates/task-image-scan-task.yaml.j2
@@ -15,7 +15,7 @@ spec:
       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: image_digest
       description:  Digest in sha256 hash format of the image to scan
@@ -41,5 +41,5 @@ spec:
         curl -k -L -H "Authorization: Bearer $ROX_API_TOKEN" https://$ROX_CENTRAL_ENDPOINT/api/cli/download/roxctl-linux --output ./roxctl  > /dev/null; echo "Getting roxctl"
         chmod +x ./roxctl > /dev/null
         echo "## Scanning image $(params.image)@$(params.image_digest)"
-        ./roxctl image scan --insecure-skip-tls-verify -e $ROX_CENTRAL_ENDPOINT --image $(params.image)@$(params.image_digest) --format $(params.output_format)
+        ./roxctl image scan --insecure-skip-tls-verify -e $ROX_CENTRAL_ENDPOINT --image $(params.image)@$(params.image_digest) --output $(params.output_format)
         echo "## Go to https://$ROX_CENTRAL_ENDPOINT/main/vulnerability-management/image/$(params.image_digest) to check more info"
diff --git a/install.sh b/install.sh
@@ -17,5 +17,4 @@ err() {
 }
 
 info "Installing Demo"
-ansible-playbook bootstrap/deploy_demo.yaml
-
+ansible-playbook bootstrap/deploy_demo.yaml -v