Commit 5e20689d authored by Sean McGivern's avatar Sean McGivern

Merge branch 'GL-12757' into 'master'

Increase clair scanner from v11 to v12

See merge request gitlab-org/gitlab-ce!30809
parents c1ad6645 b7733d5f
---
title: Update the container scanning CI template to use v12 of the clair scanner.
merge_request: 30809
author:
type: changed
......@@ -23,8 +23,8 @@ container_scanning:
DOCKER_SERVICE: docker
DOCKER_HOST: tcp://${DOCKER_SERVICE}:2375/
# https://hub.docker.com/r/arminc/clair-local-scan/tags
CLAIR_LOCAL_SCAN_VERSION: v2.0.8_fe9b059d930314b54c78f75afe265955faf4fdc1
CLAIR_EXECUTABLE_VERSION: v11
CLAIR_LOCAL_SCAN_VERSION: v2.0.8_0ed98e9ead65a51ba53f7cc53fa5e80c92169207
CLAIR_EXECUTABLE_VERSION: v12
## Disable the proxy for clair-local-scan, otherwise Container Scanning will
## fail when a proxy is used.
NO_PROXY: ${DOCKER_SERVICE},localhost
......
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