Skip to content

combine proxy templates using input #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2025
Merged

combine proxy templates using input #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 2 additions & 21 deletions scanner.direct.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {}
24 changes: 2 additions & 22 deletions scanner.group.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {}
27 changes: 16 additions & 11 deletions scanner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
- |
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down