Merge pull request #1887 from gchq/bugfix/clamav-filesystem-permissions

fix bad clamav filesystem permissions
gchq · Feb 5, 2025 · c41e5ef · c41e5ef
2 parents b218a6e + 6184945
commit c41e5ef
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -26,7 +26,7 @@ services:
       - minioVolume:/bitnami/minio
 
   clamd:
-    image: clamav/clamav:1.3
+    image: clamav/clamav:1.4.2_base
     healthcheck:
       test: ['CMD-SHELL', "echo 'PING' | nc -w 5 localhost 3310"]
       interval: 30s

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - minioVolume:/bitnami/minio
 
   clamd:
-    image: clamav/clamav:1.3
+    image: clamav/clamav:1.4.2_base
     healthcheck:
       test: ['CMD-SHELL', "echo 'PING' | nc -w 5 localhost 3310"]
       interval: 30s

diff --git a/infrastructure/helm/bailo/templates/clamav/clamav.deployment.yaml b/infrastructure/helm/bailo/templates/clamav/clamav.deployment.yaml
@@ -22,6 +22,7 @@ spec:
       {{- end }}
       securityContext:
         runAsUser: {{ .Values.clamav.runAsUser }}
+        fsGroup: {{ .Values.clamav.runAsUser }}
       containers:
       - name: {{ include "bailo.fullname" . }}-clamav
         ports:

diff --git a/infrastructure/helm/bailo/values.yaml b/infrastructure/helm/bailo/values.yaml
@@ -304,7 +304,7 @@ backend:
 clamav:
   enabled: false
   runAsUser: 1002
-  image: clamav/clamav:latest_base # https://docs.clamav.net/manual/Installing/Docker.html#the-official-images-on-docker-hub
+  image: clamav/1.4.2_base # https://docs.clamav.net/manual/Installing/Docker.html#the-official-images-on-docker-hub
   port: 3310
   accessModes:
     - ReadWriteOnce