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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
2a6dab97
Commit
2a6dab97
authored
Jun 19, 2019
by
Philippe Lafoucrière
Committed by
James Lopez
Jun 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Container Scanning job with K8S runners
parent
1af9a690
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml
changelogs/unreleased/11448-fix-cs-with-k8s-runners.yml
+5
-0
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/11448-fix-cs-with-k8s-runners.yml
0 → 100644
View file @
2a6dab97
---
title
:
Fix Container Scanning job timeout when using the kubernetes executor
merge_request
:
29706
author
:
type
:
fixed
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
View file @
2a6dab97
...
...
@@ -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..."
...
...
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