Merge branch 'patch-72' into 'master'

Set DOCKER_TLS_CERTDIR in CI job templates

See merge request gitlab-org/gitlab-ce!31201

(cherry picked from commit 82ce29d3)

8d4f53a0 Set DOCKER_TLS_CERTDIR in CI job templates
25486f40 Merge remote-tracking branch 'upstream/master' into patch-72
2535575c Add changelog.

changelogs/unreleased/patch-72.yml

+---
+title: Fix Docker in Docker (DIND) listen port behavior change by adding DOCKER_TLS_CERTDIR in CI job templates.
+merge_request: 31201
+author: Cameron Boulton
+type: fixed

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

@@ -5,6 +5,7 @@ container_scanning:
   image: docker:stable
   variables:
     DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
     # Defining two new variables based on GitLab's CI/CD predefined variables
     # https://docs.gitlab.com/ee/ci/variables/#predefined-environment-variables
     CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG