Commit 54dbaba5 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch '11105-fix-cs-with-proxy' into 'master'

Disable proxy in container scanning template

Closes gitlab-ee#11105

See merge request gitlab-org/gitlab-ce!27246
parents 9daae83f b41b9e60
---
title: Fix proxy support in Container Scanning
merge_request: 27246
author:
type: fixed
...@@ -23,6 +23,9 @@ container_scanning: ...@@ -23,6 +23,9 @@ 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
## Disable the proxy for clair-local-scan, otherwise Container Scanning will
## fail when a proxy is used.
NO_PROXY: ${DOCKER_SERVICE},localhost
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
......
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