fix docker image + install whitelists on build (#968)
* fix docker image + install whitelists on build
This commit is contained in:
parent
e929ba16de
commit
ff400c9bca
|
@ -10,8 +10,7 @@ COPY . .
|
||||||
|
|
||||||
RUN SYSTEM="docker" make release
|
RUN SYSTEM="docker" make release
|
||||||
RUN cd crowdsec-v* && ./wizard.sh --docker-mode && cd -
|
RUN cd crowdsec-v* && ./wizard.sh --docker-mode && cd -
|
||||||
RUN cscli hub update && cscli collections install crowdsecurity/linux
|
RUN cscli hub update && cscli collections install crowdsecurity/linux && cscli parsers install crowdsecurity/whitelists
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
RUN apk update --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community && apk add --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community tzdata yq
|
RUN apk update --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community && apk add --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community tzdata yq
|
||||||
COPY --from=build /etc/crowdsec /etc/crowdsec
|
COPY --from=build /etc/crowdsec /etc/crowdsec
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
if [ "$DISABLE_AGENT" == "" ] ; then
|
if [ "$DISABLE_AGENT" == "" ] ; then
|
||||||
echo "Check if the container has already been started (ignore if agent is disabled)"
|
echo "Check if the container has already been started (ignore if agent is disabled)"
|
||||||
cscli machines list | grep localhost
|
cscli machines list | grep localhost
|
||||||
if [ $? == 1 ]; then
|
if [ "$?" == 1 ]; then
|
||||||
cscli lapi register --machine localhost
|
cscli machines add localhost --auto
|
||||||
fi
|
fi
|
||||||
if [ "$AGENT_USERNAME" != "" ] && [ "$AGENT_PASSWORD" != "" ] && [ "$LOCAL_API_URL" != "" ] ; then
|
if [ "$AGENT_USERNAME" != "" ] && [ "$AGENT_PASSWORD" != "" ] && [ "$LOCAL_API_URL" != "" ] ; then
|
||||||
echo "set up lapi credentials for agent"
|
echo "set up lapi credentials for agent"
|
||||||
|
@ -46,6 +46,7 @@ fi
|
||||||
## Install collections, parsers & scenarios
|
## Install collections, parsers & scenarios
|
||||||
cscli hub update
|
cscli hub update
|
||||||
cscli collections upgrade crowdsecurity/linux || true
|
cscli collections upgrade crowdsecurity/linux || true
|
||||||
|
cscli parsers upgrade crowdsecurity/whitelists || true
|
||||||
if [ "$COLLECTIONS" != "" ]; then
|
if [ "$COLLECTIONS" != "" ]; then
|
||||||
cscli collections install $COLLECTIONS
|
cscli collections install $COLLECTIONS
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue