From 923137150de4a7f5ace51394c6e4aa98acea0584 Mon Sep 17 00:00:00 2001
From: Jonathan Serafini <jonathan@serafini.ca>
Date: Wed, 30 Apr 2025 12:04:25 -0400
Subject: [PATCH] combine proxy templates using input

---
 scanner.direct.yml | 23 ++---------------------
 scanner.group.yml  | 24 ++----------------------
 scanner.yml        | 27 ++++++++++++++++-----------
 3 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/scanner.direct.yml b/scanner.direct.yml
index b66e29a..38fc545 100644
--- a/scanner.direct.yml
+++ b/scanner.direct.yml
@@ -1,21 +1,2 @@
-.boost_setup:
-  image: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:28-cli"
-
-.boost_dind:
-  services:
-    - name: "${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:28-dind"
-      alias: dockerdaemon
-      # Support for listening on TCP without authentication or explicit
-      # intent to run without authentication will be removed in the next
-      # release
-      command: ["--host", "tcp://0.0.0.0:2375", "--tls=false"]
-
-  variables:
-    CI_DOCKER_PROXY: $CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX
-    DOCKER_HOST: "tcp://dockerdaemon:2375/"
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-
-.boost_scan:
-  variables:
-    CI_DOCKER_PROXY: $CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX
+# DEPRECATED
+variables: {}
diff --git a/scanner.group.yml b/scanner.group.yml
index 882f8fb..38fc545 100644
--- a/scanner.group.yml
+++ b/scanner.group.yml
@@ -1,22 +1,2 @@
-.boost_setup:
-  image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:28-cli"
-
-.boost_dind:
-  services:
-    - name: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:28-dind"
-      alias: dockerdaemon
-      # Support for listening on TCP without authentication or explicit
-      # intent to run without authentication will be removed in the next
-      # release
-      command: ["--host", "tcp://0.0.0.0:2375", "--tls=false"]
-
-  variables:
-    CI_DOCKER_PROXY: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
-    DOCKER_HOST: "tcp://dockerdaemon:2375/"
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-
-
-.boost_scan:
-  variables:
-    CI_DOCKER_PROXY: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX
+# DEPRECATED
+variables: {}
diff --git a/scanner.yml b/scanner.yml
index fcf4ccb..e64f159 100644
--- a/scanner.yml
+++ b/scanner.yml
@@ -1,5 +1,19 @@
+spec:
+  inputs:
+    proxy:
+      default: '$BOOST_DOCKER_PROXY'
+---
+variables:
+  BOOST_DOCKER_PROXY_direct: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}
+  BOOST_DOCKER_PROXY_group: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}
+  CI_DOCKER_PROXY: ${BOOST_DOCKER_PROXY_$[[ inputs.proxy | expand_vars ]]}
+  BOOST_DOCKER_PROXY_direct_PREFIX: ${BOOST_DOCKER_PROXY_direct}/
+  BOOST_DOCKER_PROXY_group_PREFIX: ${BOOST_DOCKER_PROXY_group}/
+  BOOST_DOCKER_CLI_IMAGE: ${BOOST_DOCKER_PROXY_$[[ inputs.proxy | expand_vars ]]_PREFIX}docker:28-cli
+  BOOST_DOCKER_DND_IMAGE: ${BOOST_DOCKER_PROXY_$[[ inputs.proxy | expand_vars ]]_PREFIX}docker:28-dind
+
 .boost_setup:
-  image: "docker:28-cli"
+  image: $BOOST_DOCKER_CLI_IMAGE
 
   before_script:
     - |
@@ -46,15 +60,6 @@
         boost_init_config
         boost_init_cli
     - |
-      if [ -n "${BOOST_DOCKER_PROXY:-}" ] && [ -z "${CI_DOCKER_PROXY}" ] ; then
-        # NOTE: backwards-compatibility for templates without multi-include
-        if [ "${BOOST_DOCKER_PROXY:-}" == "group" ]; then
-          export CI_DOCKER_PROXY="${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}"
-        elif [ "${BOOST_DOCKER_PROXY:-}" == "direct" ]; then
-          export CI_DOCKER_PROXY="${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}"
-        fi
-      fi
-
       if [ -n "${CI_DOCKER_PROXY:-}" ]; then
         echo "${CI_DEPENDENCY_PROXY_PASSWORD}" | docker login "${CI_DEPENDENCY_PROXY_SERVER}" -u "${CI_DEPENDENCY_PROXY_USER}" --password-stdin
       fi
@@ -71,7 +76,7 @@
 
 .boost_dind:
   services:
-    - name: "docker:28-dind"
+    - name: $BOOST_DOCKER_DND_IMAGE
       alias: dockerdaemon
       # Support for listening on TCP without authentication or explicit
       # intent to run without authentication will be removed in the next