From e2c386bd2d52b646009e267e55c746f8b3b6957a Mon Sep 17 00:00:00 2001 From: he2ss Date: Thu, 5 Oct 2023 16:31:17 +0200 Subject: [PATCH] bump crowdsec and firewall bouncer versions --- crowdsec-firewall-bouncer/Dockerfile | 2 +- crowdsec-firewall-bouncer/config.yaml | 2 +- crowdsec/Dockerfile | 22 +++++++++++----------- crowdsec/config.yaml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/crowdsec-firewall-bouncer/Dockerfile b/crowdsec-firewall-bouncer/Dockerfile index 675b7b0..5174a02 100644 --- a/crowdsec-firewall-bouncer/Dockerfile +++ b/crowdsec-firewall-bouncer/Dockerfile @@ -2,7 +2,7 @@ ARG BUILD_FROM FROM $BUILD_FROM ARG BUILD_ARCH -ARG BIN_VERSION=v0.0.26 +ARG BIN_VERSION=v0.0.28 RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/crowdsec-firewall-bouncer/config.yaml b/crowdsec-firewall-bouncer/config.yaml index a2b5000..d9cf6f7 100644 --- a/crowdsec-firewall-bouncer/config.yaml +++ b/crowdsec-firewall-bouncer/config.yaml @@ -1,7 +1,7 @@ name: "Crowdsec Firewall Bouncer" description: "Crowdsec bouncer written in golang for firewalls" url: "https://github.com/crowdsecurity/home-assistant-addons/tree/main/crowdsec-firewall-bouncer/DOCS.md" -version: "v0.0.26-ha2" +version: "v0.0.28" slug: crowdsec-firewall-bouncer init: false host_network: true diff --git a/crowdsec/Dockerfile b/crowdsec/Dockerfile index e0fbd9c..8b00649 100644 --- a/crowdsec/Dockerfile +++ b/crowdsec/Dockerfile @@ -45,21 +45,21 @@ RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/ #Add alias until env variables will be supported by crowdsec. RUN echo 'alias cscli="cscli -c /config/.storage/crowdsec/config/config.yaml"' > /root/.bashrc -COPY --from=crowdsecurity/crowdsec:v1.5.2 /staging/etc/crowdsec /etc/crowdsec -COPY --from=crowdsecurity/crowdsec:v1.5.2 /staging/var/lib/crowdsec /var/lib/crowdsec -COPY --from=crowdsecurity/crowdsec:v1.5.2 /usr/local/bin/crowdsec /usr/local/bin/crowdsec -COPY --from=crowdsecurity/crowdsec:v1.5.2 /usr/local/bin/cscli /usr/local/bin/cscli -COPY --from=crowdsecurity/crowdsec:v1.5.2 /docker_start.sh /docker_start.sh -COPY --from=crowdsecurity/crowdsec:v1.5.2 /staging/etc/crowdsec/config.yaml /etc/crowdsec/config.yaml +COPY --from=crowdsecurity/crowdsec:v1.5.4 /staging/etc/crowdsec /etc/crowdsec +COPY --from=crowdsecurity/crowdsec:v1.5.4 /staging/var/lib/crowdsec /var/lib/crowdsec +COPY --from=crowdsecurity/crowdsec:v1.5.4 /usr/local/bin/crowdsec /usr/local/bin/crowdsec +COPY --from=crowdsecurity/crowdsec:v1.5.4 /usr/local/bin/cscli /usr/local/bin/cscli +COPY --from=crowdsecurity/crowdsec:v1.5.4 /docker_start.sh /docker_start.sh +COPY --from=crowdsecurity/crowdsec:v1.5.4 /staging/etc/crowdsec/config.yaml /etc/crowdsec/config.yaml #Due to the wizard using cp -n, we have to copy the config files directly from the source as -n does not exist in busybox cp #The files are here for reference, as users will need to mount a new version to be actually able to use notifications -COPY --from=crowdsecurity/crowdsec:v1.5.2 /staging/etc/crowdsec/notifications/email.yaml /etc/crowdsec/notifications/email.yaml -COPY --from=crowdsecurity/crowdsec:v1.5.2 /staging/etc/crowdsec/notifications/http.yaml /etc/crowdsec/notifications/http.yaml -COPY --from=crowdsecurity/crowdsec:v1.5.2 /staging/etc/crowdsec/notifications/slack.yaml /etc/crowdsec/notifications/slack.yaml -COPY --from=crowdsecurity/crowdsec:v1.5.2 /staging/etc/crowdsec/notifications/splunk.yaml /etc/crowdsec/notifications/splunk.yaml +COPY --from=crowdsecurity/crowdsec:v1.5.4 /staging/etc/crowdsec/notifications/email.yaml /etc/crowdsec/notifications/email.yaml +COPY --from=crowdsecurity/crowdsec:v1.5.4 /staging/etc/crowdsec/notifications/http.yaml /etc/crowdsec/notifications/http.yaml +COPY --from=crowdsecurity/crowdsec:v1.5.4 /staging/etc/crowdsec/notifications/slack.yaml /etc/crowdsec/notifications/slack.yaml +COPY --from=crowdsecurity/crowdsec:v1.5.4 /staging/etc/crowdsec/notifications/splunk.yaml /etc/crowdsec/notifications/splunk.yaml # workaround to avoid having build issue ("failed to create image: failed to get layer") RUN true -COPY --from=crowdsecurity/crowdsec:v1.5.2 /usr/local/lib/crowdsec/plugins /usr/local/lib/crowdsec/plugins +COPY --from=crowdsecurity/crowdsec:v1.5.4 /usr/local/lib/crowdsec/plugins /usr/local/lib/crowdsec/plugins # Copy root filesystem COPY rootfs / diff --git a/crowdsec/config.yaml b/crowdsec/config.yaml index 2442671..0f4a430 100644 --- a/crowdsec/config.yaml +++ b/crowdsec/config.yaml @@ -1,7 +1,7 @@ name: "Crowdsec" description: "CrowdSec - the open-source and participative IPS" url: "https://github.com/crowdsecurity/home-assistant-addons/blob/main/crowdsec/DOCS.md" -version: "1.5.2-ha1" +version: "1.5.4" slug: "crowdsec" init: false ingress: true