Skip to content

Commit 4b698a3

Browse files
restore backwards compatibility for ci_docker_proxy (#20)
* restore backwards compatibility for ci_docker_proxy * fix
1 parent 832cc73 commit 4b698a3

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

scanner.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@
4646
boost_init_config
4747
boost_init_cli
4848
- |
49+
if [ -n "${BOOST_DOCKER_PROXY:-}" ] && [ -z "${CI_DOCKER_PROXY}" ] ; then
50+
# NOTE: backwards-compatibility for templates without multi-include
51+
if [ "${BOOST_DOCKER_PROXY:-}" == "group" ]; then
52+
export CI_DOCKER_PROXY="${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}"
53+
elif [ "${BOOST_DOCKER_PROXY:-}" == "direct" ]; then
54+
export CI_DOCKER_PROXY="${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}"
55+
fi
56+
fi
57+
4958
if [ -n "${CI_DOCKER_PROXY:-}" ]; then
5059
echo "${CI_DEPENDENCY_PROXY_PASSWORD}" | docker login "${CI_DEPENDENCY_PROXY_SERVER}" -u "${CI_DEPENDENCY_PROXY_USER}" --password-stdin
5160
fi

0 commit comments

Comments
 (0)