From a0fa88077c8a6e316b781b2acae17d02c7fc22ea Mon Sep 17 00:00:00 2001 From: Jonathan Serafini Date: Wed, 30 Apr 2025 08:53:56 -0400 Subject: [PATCH 1/2] restore backwards compatibility for ci_docker_proxy --- scanner.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scanner.yml b/scanner.yml index 554c7dc..e946920 100644 --- a/scanner.yml +++ b/scanner.yml @@ -46,6 +46,14 @@ boost_init_config boost_init_cli - | + if [ -n "${BOOST_DOCKER_PROXY:-}" ] && [ -n "${CI_DOCKER_PROXY}" ] ; then + 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 From 2847d73d174f13933adbdd1d6e2287ee1596f466 Mon Sep 17 00:00:00 2001 From: Jonathan Serafini Date: Wed, 30 Apr 2025 09:00:04 -0400 Subject: [PATCH 2/2] fix --- scanner.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scanner.yml b/scanner.yml index e946920..fcf4ccb 100644 --- a/scanner.yml +++ b/scanner.yml @@ -46,7 +46,8 @@ boost_init_config boost_init_cli - | - if [ -n "${BOOST_DOCKER_PROXY:-}" ] && [ -n "${CI_DOCKER_PROXY}" ] ; then + 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