Skip to content
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.

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

BST-11897: rename docker proxy var #14

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,18 @@ The Boost Security API token secret.
**NOTE**: We recommend you not put the API token directly in your pipeline
file. Instead, it should be exposed via a **secret**.

### `CI_DOCKER_PROXY` (Optional, string)
### `BOOST_CLI_VERSION` (Optional, string)

Overrides the cli version to download when performing scans. If undefined,
this will default to pulling "1".

### `BOOST_DOCKER_PROXY` (Optional, string)

Enable or disable the gitlab dependency proxy for docker images.
May be set to one of the following values:
- disabled: disable the proxy (default)
- group: enable the group proxy
- direct: enable the direct proxy

### `BOOST_CLI_VERSION` (Optional, string)

Overrides the cli version to download when performing scans. If undefined,
this will default to pulling "1".

### `BOOST_IGNORE_FAILURE` (Optional, boolean string, default false)

Ignore any non-zero exit status and always return a success.
Expand Down
4 changes: 2 additions & 2 deletions scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
fi
done
- |
if [ "${CI_DOCKER_PROXY:-}" == "group" ]; then
if [ "${BOOST_DOCKER_PROXY:-}" == "group" ]; then
export CI_DOCKER_PROXY="${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}"
elif [ "${CI_DOCKER_PROXY:-}" == "direct" ]; then
elif [ "${BOOST_DOCKER_PROXY:-}" == "direct" ]; then
export CI_DOCKER_PROXY="${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}"
fi

Expand Down
Loading