bump to 1.7.0 (#86)

Author: blotus

crowdsec/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.7.0
+
+- Bump crowdsec version to 1.7.0
+
 ## 1.6.11
 
 - Bump crowdsec version to 1.6.11

crowdsec/Dockerfile

@@ -16,26 +16,26 @@ RUN apt-get install -y -q --install-recommends --no-install-suggests \
     vim \
     nano \
     && if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "armv7" ]; then \
-        wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_arm"; \
+    wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_arm"; \
     elif [ "${BUILD_ARCH}" = "aarch64" ]; then \
-        wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_arm64"; \
+    wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_arm64"; \
     elif [ "${BUILD_ARCH}" = "i386" ]; then \
-        wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_386"; \
+    wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_386"; \
     elif [ "${BUILD_ARCH}" = "amd64" ]; then \
-        wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_amd64"; \
+    wget -q -O /usr/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_amd64"; \
     else \
-        exit 1; \
+    exit 1; \
     fi \
     && if [ "${BUILD_ARCH}" = "armhf" ]; then \
-        wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.armhf"; \
+    wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.armhf"; \
     elif [ "${BUILD_ARCH}" = "armv7" ]; then \
-        wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.arm"; \
+    wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.arm"; \
     elif [ "${BUILD_ARCH}" = "aarch64" ]; then \
-        wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.aarch64"; \
+    wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.aarch64"; \
     elif [ "${BUILD_ARCH}" = "i386" ] || [ "${BUILD_ARCH}" = "amd64" ]; then \
-        wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.x86_64"; \
+    wget -q -O /usr/bin/ttyd "https://github.com/tsl0922/ttyd/releases/download/1.6.3/ttyd.x86_64"; \
     else \
-        exit 1; \
+    exit 1; \
     fi \
     && chmod +x /usr/bin/yq \
     && chmod +x /usr/bin/ttyd \
@@ -46,18 +46,18 @@ RUN echo "deb http://deb.debian.org/debian bookworm-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.6.11 /staging/etc/crowdsec /etc/crowdsec
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /staging/var/lib/crowdsec /var/lib/crowdsec
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /usr/local/bin/crowdsec /usr/local/bin/crowdsec
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /usr/local/bin/cscli /usr/local/bin/cscli
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /docker_start.sh /docker_start.sh
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /staging/etc/crowdsec/config.yaml /etc/crowdsec/config.yaml
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /staging/etc/crowdsec /etc/crowdsec
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /staging/var/lib/crowdsec /var/lib/crowdsec
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /usr/local/bin/crowdsec /usr/local/bin/crowdsec
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /usr/local/bin/cscli /usr/local/bin/cscli
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /docker_start.sh /docker_start.sh
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /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.6.11 /staging/etc/crowdsec/notifications/email.yaml /etc/crowdsec/notifications/email.yaml
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /staging/etc/crowdsec/notifications/http.yaml /etc/crowdsec/notifications/http.yaml
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /staging/etc/crowdsec/notifications/slack.yaml /etc/crowdsec/notifications/slack.yaml
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /staging/etc/crowdsec/notifications/splunk.yaml /etc/crowdsec/notifications/splunk.yaml
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /staging/etc/crowdsec/notifications/email.yaml /etc/crowdsec/notifications/email.yaml
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /staging/etc/crowdsec/notifications/http.yaml /etc/crowdsec/notifications/http.yaml
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /staging/etc/crowdsec/notifications/slack.yaml /etc/crowdsec/notifications/slack.yaml
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /staging/etc/crowdsec/notifications/splunk.yaml /etc/crowdsec/notifications/splunk.yaml
 # This is an ugly workaround for an issue reported on discord
 # The container fails to start with the error "ln: failed to create symbolic link '/var/lib/crowdsec/data/*': File exists"
 # In the HA container, /staging/var/lib/crowdsec/data/ does not exist, and the crowdsec docker_start.sh script loops
@@ -68,7 +68,7 @@ COPY --from=crowdsecurity/crowdsec:v1.6.11 /staging/etc/crowdsec/notifications/s
 RUN mkdir -p /staging/var/lib/crowdsec/data/ && touch /staging/var/lib/crowdsec/data/crowdsec.db
 # workaround to avoid having build issue ("failed to create image: failed to get layer")
 RUN true
-COPY --from=crowdsecurity/crowdsec:v1.6.11 /usr/local/lib/crowdsec/plugins /usr/local/lib/crowdsec/plugins
+COPY --from=crowdsecurity/crowdsec:v1.7.0 /usr/local/lib/crowdsec/plugins /usr/local/lib/crowdsec/plugins
 
 # Copy root filesystem
 COPY rootfs /

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.6.11"
+version: "1.7.0"
 slug: "crowdsec"
 init: false
 ingress: true