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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c94e20d6
Commit
c94e20d6
authored
Jan 08, 2020
by
Philippe Lafoucrière
Committed by
Sean McGivern
Jan 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not ignore DEPENDENCY_SCANNING_DISABLED if DS_DISABLE_DIND is set
parent
9293becb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
changelogs/unreleased/22171-fix-disabling-dependency-scanning.yml
...gs/unreleased/22171-fix-disabling-dependency-scanning.yml
+5
-0
lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
...b/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
+1
-0
No files found.
changelogs/unreleased/22171-fix-disabling-dependency-scanning.yml
0 → 100644
View file @
c94e20d6
---
title
:
Check both DEPENDENCY_SCANNING_DISABLED and DS_DISABLE_DIND when executing Dependency Scanning job template
merge_request
:
22172
author
:
type
:
fixed
lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
View file @
c94e20d6
...
...
@@ -77,6 +77,7 @@ dependency_scanning:
services
:
[]
except
:
variables
:
-
$DEPENDENCY_SCANNING_DISABLED
-
$DS_DISABLE_DIND == 'false'
script
:
-
/analyzer run
...
...
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