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
5520a42e
Commit
5520a42e
authored
May 07, 2019
by
Olivier Gonzalez
Committed by
James Lopez
May 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump clair-local-scan to v2.0.8
parent
96959ba3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
3 deletions
+10
-3
changelogs/unreleased/ce-11430-update_clair_local_scan.yml
changelogs/unreleased/ce-11430-update_clair_local_scan.yml
+5
-0
doc/user/application_security/container_scanning/index.md
doc/user/application_security/container_scanning/index.md
+4
-2
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
...ab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
+1
-1
No files found.
changelogs/unreleased/ce-11430-update_clair_local_scan.yml
0 → 100644
View file @
5520a42e
---
title
:
Update clair-local-scan to v2.0.8 for container scanning
merge_request
:
27977
author
:
type
:
other
doc/user/application_security/container_scanning/index.md
View file @
5520a42e
...
@@ -122,12 +122,13 @@ container_scanning:
...
@@ -122,12 +122,13 @@ container_scanning:
## https://docs.gitlab.com/ee/ci/variables/#predefined-environment-variables
## https://docs.gitlab.com/ee/ci/variables/#predefined-environment-variables
CI_APPLICATION_REPOSITORY
:
$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG
CI_APPLICATION_REPOSITORY
:
$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG
CI_APPLICATION_TAG
:
$CI_COMMIT_SHA
CI_APPLICATION_TAG
:
$CI_COMMIT_SHA
CLAIR_LOCAL_SCAN_VERSION
:
v2.0.8_fe9b059d930314b54c78f75afe265955faf4fdc1
allow_failure
:
true
allow_failure
:
true
services
:
services
:
-
docker:stable-dind
-
docker:stable-dind
script
:
script
:
-
docker run -d --name db arminc/clair-db:latest
-
docker run -d --name db arminc/clair-db:latest
-
docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:
v2.0.6
-
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/v8/clair-scanner_linux_amd64
...
@@ -164,12 +165,13 @@ container_scanning:
...
@@ -164,12 +165,13 @@ container_scanning:
## https://docs.gitlab.com/ee/ci/variables/#predefined-environment-variables
## https://docs.gitlab.com/ee/ci/variables/#predefined-environment-variables
CI_APPLICATION_REPOSITORY
:
$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG
CI_APPLICATION_REPOSITORY
:
$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG
CI_APPLICATION_TAG
:
$CI_COMMIT_SHA
CI_APPLICATION_TAG
:
$CI_COMMIT_SHA
CLAIR_LOCAL_SCAN_VERSION
:
v2.0.8_fe9b059d930314b54c78f75afe265955faf4fdc1
allow_failure
:
true
allow_failure
:
true
services
:
services
:
-
docker:stable-dind
-
docker:stable-dind
script
:
script
:
-
docker run -d --name db arminc/clair-db:latest
-
docker run -d --name db arminc/clair-db:latest
-
docker run -p 6060:6060 --link db:postgres -d --name clair --restart on-failure arminc/clair-local-scan:
v2.0.6
-
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/v8/clair-scanner_linux_amd64
...
...
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
View file @
5520a42e
...
@@ -22,7 +22,7 @@ container_scanning:
...
@@ -22,7 +22,7 @@ container_scanning:
DOCKER_SERVICE
:
docker
DOCKER_SERVICE
:
docker
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.
6
CLAIR_LOCAL_SCAN_VERSION
:
v2.0.
8_fe9b059d930314b54c78f75afe265955faf4fdc1
allow_failure
:
true
allow_failure
:
true
services
:
services
:
-
docker:stable-dind
-
docker:stable-dind
...
...
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