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
f0212cd3
Commit
f0212cd3
authored
Jul 10, 2019
by
Can Eldem
Committed by
Thong Kuah
Jul 10, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Clair Version V8 to V11
parent
1ed911ad
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
changelogs/unreleased/update-clair-version.yml
changelogs/unreleased/update-clair-version.yml
+6
-0
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
...ab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
+2
-1
No files found.
changelogs/unreleased/update-clair-version.yml
0 → 100644
View file @
f0212cd3
---
title
:
Extract clair version as CLAIR_EXECUTABLE_VERSION variable and update clair
executable from v8 to v11
merge_request
:
30396
author
:
type
:
changed
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
View file @
f0212cd3
...
@@ -23,6 +23,7 @@ container_scanning:
...
@@ -23,6 +23,7 @@ container_scanning:
DOCKER_HOST
:
tcp://${DOCKER_SERVICE}:2375/
DOCKER_HOST
:
tcp://${DOCKER_SERVICE}:2375/
# https://hub.docker.com/r/arminc/clair-local-scan/tags
# https://hub.docker.com/r/arminc/clair-local-scan/tags
CLAIR_LOCAL_SCAN_VERSION
:
v2.0.8_fe9b059d930314b54c78f75afe265955faf4fdc1
CLAIR_LOCAL_SCAN_VERSION
:
v2.0.8_fe9b059d930314b54c78f75afe265955faf4fdc1
CLAIR_EXECUTABLE_VERSION
:
v11
## Disable the proxy for clair-local-scan, otherwise Container Scanning will
## Disable the proxy for clair-local-scan, otherwise Container Scanning will
## fail when a proxy is used.
## fail when a proxy is used.
NO_PROXY
:
${DOCKER_SERVICE},localhost
NO_PROXY
:
${DOCKER_SERVICE},localhost
...
@@ -41,7 +42,7 @@ container_scanning:
...
@@ -41,7 +42,7 @@ container_scanning:
-
docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:${CLAIR_LOCAL_SCAN_VERSION}
-
docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:${CLAIR_LOCAL_SCAN_VERSION}
-
apk add -U wget ca-certificates
-
apk add -U wget ca-certificates
-
docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
-
docker pull ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG}
-
wget https://github.com/arminc/clair-scanner/releases/download/
v8
/clair-scanner_linux_amd64
-
wget https://github.com/arminc/clair-scanner/releases/download/
${CLAIR_EXECUTABLE_VERSION}
/clair-scanner_linux_amd64
-
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
...
...
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