Merge branch '37278-DS_DISABLE_DIND-true' into 'master'

Make DS_DISABLE_DIND true

See merge request gitlab-org/gitlab!31588

changelogs/unreleased/37278-DS_DISABLE_DIND-true.yml

+---
+title: 'Disable Docker-in-Docker for Dependency Scanning by default'
+merge_request: 31588
+author:
+type: changed

ee/spec/lib/gitlab/ci/templates/dependency_scanning_gitlab_ci_yaml_spec.rb

@@ -33,7 +33,11 @@ describe 'Dependency-Scanning.gitlab-ci.yml' do
         allow(License).to receive(:current).and_return(license)
       end
 
-      context 'by default' do
+      context 'when DS_DISABLE_DIND=false' do
+        before do
+          create(:ci_variable, project: project, key: 'DS_DISABLE_DIND', value: 'false')
+        end
+
         it 'includes orchestrator job' do
           expect(build_names).to match_array(%w[dependency_scanning])
         end
@@ -49,11 +53,7 @@ describe 'Dependency-Scanning.gitlab-ci.yml' do
         end
       end
 
-      context 'when DS_DISABLE_DIND=true' do
-        before do
-          create(:ci_variable, project: project, key: 'DS_DISABLE_DIND', value: 'true')
-        end
-
+      context 'by default' do
         describe 'language detection' do
           using RSpec::Parameterized::TableSyntax
 

lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml

@@ -14,7 +14,7 @@ variables:
 
   DS_DEFAULT_ANALYZERS: "bundler-audit, retire.js, gemnasium, gemnasium-maven, gemnasium-python"
   DS_MAJOR_VERSION: 2
-  DS_DISABLE_DIND: "false"
+  DS_DISABLE_DIND: "true"
 
 dependency_scanning:
   stage: test