Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0c85f6b4
Commit
0c85f6b4
authored
Mar 06, 2020
by
Adam Cohen
Committed by
Lin Jen-Shin
Mar 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Container Scanning kubernetes workaround
parent
843ca90c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
changelogs/unreleased/remove-cs-kubernetes-workaround.yml
changelogs/unreleased/remove-cs-kubernetes-workaround.yml
+5
-0
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
...ab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
+2
-7
No files found.
changelogs/unreleased/remove-cs-kubernetes-workaround.yml
0 → 100644
View file @
0c85f6b4
---
title
:
Remove kubernetes workaround in container scanning
merge_request
:
21188
author
:
type
:
changed
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
View file @
0c85f6b4
...
...
@@ -5,9 +5,7 @@ variables:
container_scanning
:
stage
:
test
image
:
name
:
registry.gitlab.com/gitlab-org/security-products/analyzers/klar:$CS_MAJOR_VERSION
entrypoint
:
[]
image
:
registry.gitlab.com/gitlab-org/security-products/analyzers/klar:$CS_MAJOR_VERSION
variables
:
# 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
...
...
@@ -22,10 +20,7 @@ container_scanning:
-
name
:
$CLAIR_DB_IMAGE
alias
:
clair-vulnerabilities-db
script
:
# the kubernetes executor currently ignores the Docker image entrypoint value, so the start.sh script must
# 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
-
/analyzer run
artifacts
:
reports
:
container_scanning
:
gl-container-scanning-report.json
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment