Commit 69e1bd38 authored by James Lopez's avatar James Lopez

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
parents 1af9a690 2a6dab97
---
title: Fix Container Scanning job timeout when using the kubernetes executor
merge_request: 29706
author:
type: fixed
...@@ -30,7 +30,7 @@ container_scanning: ...@@ -30,7 +30,7 @@ container_scanning:
services: services:
- docker:stable-dind - docker:stable-dind
script: 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 if [[ -n "$CI_REGISTRY_USER" ]]; then
echo "Logging to GitLab Container Registry with CI credentials..." echo "Logging to GitLab Container Registry with CI credentials..."
......
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