Skip to content

fix(docker): honor DISABLE_* hub knobs when the agent is disabled #4615

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

Open
hamodywe wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −0
Open

fix(docker): honor DISABLE_* hub knobs when the agent is disabled #4615

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
10 changes: 10 additions & 0 deletions build/docker/docker_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,17 @@ difference() {
# prepare_hub updates/installs/removes Hub items based on env vars, but only when the agent is expected to run.
# It exits early when the agent is disabled with DISABLE_AGENT or in the configuration.
prepare_hub() {
# The default hub items are copied from /staging regardless of the agent
# (see the rsync in the staging step), so the DISABLE_* knobs have to be
# honored even when no agent runs - otherwise a LAPI-only container keeps
# collections it was explicitly told to drop.
if istrue "$DISABLE_AGENT"; then
remove_hub_items
return
fi

if conf_get '.crowdsec_service ?= null or (.crowdsec_service.enable? == false)' >/dev/null 2>&1; then
remove_hub_items
return
fi

Expand Down Expand Up @@ -256,6 +262,10 @@ prepare_hub() {
cscli_if_clean appsec-rules install "$(difference "$APPSEC_RULES" "$DISABLE_APPSEC_RULES")"
fi

remove_hub_items
}

remove_hub_items() {
## Remove collections, parsers, scenarios & postoverflows
if [ "$DISABLE_COLLECTIONS" != "" ]; then
# shellcheck disable=SC2086
Expand Down
Loading