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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
07905c69
Commit
07905c69
authored
Apr 16, 2018
by
Gilbert Roulot
Committed by
Robert Speicher
Apr 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix container scanning in vendored GitLab CI configuration for Auto Devops
parent
671a204c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
doc/ci/examples/container_scanning.md
doc/ci/examples/container_scanning.md
+1
-0
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+1
-0
No files found.
doc/ci/examples/container_scanning.md
View file @
07905c69
...
@@ -30,6 +30,7 @@ sast:container:
...
@@ -30,6 +30,7 @@ sast:container:
-
mv clair-scanner_linux_amd64 clair-scanner
-
mv clair-scanner_linux_amd64 clair-scanner
-
chmod +x clair-scanner
-
chmod +x clair-scanner
-
touch clair-whitelist.yml
-
touch clair-whitelist.yml
-
while( ! wget -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; done
-
./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} ||
true
-
./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} ||
true
artifacts
:
artifacts
:
paths
:
[
gl-sast-container-report.json
]
paths
:
[
gl-sast-container-report.json
]
...
...
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
View file @
07905c69
...
@@ -315,6 +315,7 @@ production:
...
@@ -315,6 +315,7 @@ production:
mv clair-scanner_linux_amd64 clair-scanner
mv clair-scanner_linux_amd64 clair-scanner
chmod +x clair-scanner
chmod +x clair-scanner
touch clair-whitelist.yml
touch clair-whitelist.yml
while( ! wget -q -O /dev/null http://docker:6060/v1/namespaces ) ; do sleep 1 ; done
./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true
./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true
}
}
...
...
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