kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '11448-fix-cs-with-k8s-runners' into 'master' 

Fix Container Scanning job with K8S runners

Closes gitlab-ee#11448

See merge request gitlab-org/gitlab-ce!29706
This commit is contained in:
James Lopez 2019-06-19 06:31:23 +00:00
parent 1af9a690d5 2a6dab97d9
commit 69e1bd389f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix Container Scanning job timeout when using the kubernetes executor
merge_request: 29706
author:
type: fixed

2
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
View File

@ -30,7 +30,7 @@ container_scanning:
services:
- docker:stable-dind
script:
- if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then { export DOCKER_SERVICE="localhost" ; export DOCKER_HOST="tcp://${DOCKER_SERVICE}:2375" ; } fi
- if [[ -n "$KUBERNETES_PORT" ]]; then { export DOCKER_SERVICE="localhost" ; export DOCKER_HOST="tcp://${DOCKER_SERVICE}:2375" ; } fi
- |
if [[ -n "$CI_REGISTRY_USER" ]]; then
echo "Logging to GitLab Container Registry with CI credentials..."