update dependencies and move CRS into Dockerfile for coraza

Author: fl0ppy-d1sk

.tests/clamav/docker-compose.yml

@@ -50,7 +50,7 @@ services:
       - bw-docker
 
   clamav:
-    image: clamav/clamav:1.1
+    image: clamav/clamav:1.2
     volumes:
       - clamav-data:/var/lib/clamav
     networks:

.tests/crowdsec/docker-compose.yml

@@ -56,7 +56,7 @@ services:
       - bw-docker
 
   crowdsec:
-    image: crowdsecurity/crowdsec:v1.5.2
+    image: crowdsecurity/crowdsec:v1.5.5
     volumes:
       - cs-data:/var/lib/crowdsec/data
       - ./acquis.yaml:/etc/crowdsec/acquis.yaml
@@ -69,7 +69,7 @@ services:
       - bw-universe
 
   syslog:
-    image: balabit/syslog-ng:4.2.0
+    image: balabit/syslog-ng:4.4.0
     command: --no-caps
     volumes:
       - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf

clamav/README.md

@@ -44,14 +44,11 @@ services:
     ...
 
   clamav:
-    image: clamav/clamav:1.1
+    image: clamav/clamav:1.2
     volumes:
       - ./clamav-data:/var/lib/clamav
     networks:
       - bw-plugins
-
-  redis:
-    image: redis:7-alpine
 ```
 
 ## Swarm
@@ -73,7 +70,7 @@ services:
     ...
 
   clamav:
-    image: clamav/clamav:1.1
+    image: clamav/clamav:1.2
     networks:
       - bw-plugins
 
@@ -106,7 +103,7 @@ spec:
     spec:
       containers:
         - name: bunkerweb-clamav
-          image: clamav/clamav:1.1
+          image: clamav/clamav:1.2
 ---
 apiVersion: v1
 kind: Service

coraza/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine AS builder
+FROM golang:1.21-alpine AS builder
 
 WORKDIR /usr/src/app
 
@@ -7,7 +7,12 @@ RUN go get -d ./...
 RUN go mod download && go mod verify
 RUN go build -v -tags=coraza.rule.multiphase_evaluation -o /usr/local/bin/bw-coraza
 
-FROM golang:1.20-alpine
+COPY crs.sh .
+RUN apk add bash git && \
+    chmod +x crs.sh && \
+    ./crs.sh Download
+
+FROM golang:1.21-alpine
 
 COPY --from=builder --chown=0:0 /usr/local/bin/bw-coraza /usr/local/bin/bw-coraza
 
@@ -18,7 +23,7 @@ RUN addgroup -g 1000 coraza && \
 
 WORKDIR /coraza
 
-COPY --chown=0:1000 coreruleset ./coreruleset
+COPY --from=builder --chown=0:1000 /usr/src/app/coreruleset ./coreruleset
 COPY --chown=0:1000 coraza.conf bunkerweb*.conf ./
 
 VOLUME /rules-before /rules-after