Commit 0c85f6b4 authored by Adam Cohen's avatar Adam Cohen Committed by Lin Jen-Shin

Remove Container Scanning kubernetes workaround

parent 843ca90c
---
title: Remove kubernetes workaround in container scanning
merge_request: 21188
author:
type: changed
...@@ -5,9 +5,7 @@ variables: ...@@ -5,9 +5,7 @@ variables:
container_scanning: container_scanning:
stage: test stage: test
image: image: registry.gitlab.com/gitlab-org/security-products/analyzers/klar:$CS_MAJOR_VERSION
name: registry.gitlab.com/gitlab-org/security-products/analyzers/klar:$CS_MAJOR_VERSION
entrypoint: []
variables: variables:
# By default, use the latest clair vulnerabilities database, however, allow it to be overridden here with a specific image # By default, use the latest clair vulnerabilities database, however, allow it to be overridden here with a specific image
# to enable container scanning to run offline, or to provide a consistent list of vulnerabilities for integration testing purposes # to enable container scanning to run offline, or to provide a consistent list of vulnerabilities for integration testing purposes
...@@ -22,10 +20,7 @@ container_scanning: ...@@ -22,10 +20,7 @@ container_scanning:
- name: $CLAIR_DB_IMAGE - name: $CLAIR_DB_IMAGE
alias: clair-vulnerabilities-db alias: clair-vulnerabilities-db
script: script:
# the kubernetes executor currently ignores the Docker image entrypoint value, so the start.sh script must - /analyzer run
# be explicitly executed here in order for this to work with both the kubernetes and docker executors
# see this issue for more details https://gitlab.com/gitlab-org/gitlab-runner/issues/4125
- /container-scanner/start.sh
artifacts: artifacts:
reports: reports:
container_scanning: gl-container-scanning-report.json container_scanning: gl-container-scanning-report.json
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment