Merge pull request #34 from UKHomeOffice/clamav-update

Update to release v0.99.4

Dockerfile

@@ -1,6 +1,6 @@
 FROM quay.io/ukhomeofficedigital/centos-base
 
-ENV CLAM_VERSION=0.99.3
+ENV CLAM_VERSION=0.99.4
 
 RUN yum update -y && \
     yum install -y gcc openssl-devel wget make
@@ -15,7 +15,7 @@ RUN wget https://www.clamav.net/downloads/production/clamav-${CLAM_VERSION}.tar.
 
 # Add clamav user
 RUN groupadd -r clamav && \
-    useradd -r -g clamav clamav -d /var/lib/clamav && \
+    useradd -r -g clamav -u 1000 clamav -d /var/lib/clamav && \
     mkdir -p /var/lib/clamav && \
     mkdir /usr/local/share/clamav && \
     chown -R clamav:clamav /var/lib/clamav /usr/local/share/clamav
@@ -31,7 +31,7 @@ RUN mkdir /var/run/clamav && \
     chown clamav:clamav /var/run/clamav && \
     chmod 750 /var/run/clamav
 
-USER clamav
+USER 1000
 
 # Configure Clam AV...
 ADD ./*.conf /usr/local/etc/

clamav-rest/Dockerfile

@@ -5,11 +5,11 @@ RUN yum update -y && \
 
 # Add clamav user
 RUN groupadd -r clamav && \
-    useradd -r -g clamav clamav -d /var/clamav-rest/&& \
+    useradd -r -g clamav -u 1000 clamav -d /var/clamav-rest/&& \
     mkdir -p /var/clamav-rest/ && \
     chown -R clamav:clamav /var/clamav-rest/
 
-USER clamav
+USER 1000
 
 # Get the JAR file
 COPY target/clamav-rest-1.0.2.jar /var/clamav-rest/

clamd.conf

@@ -192,10 +192,6 @@ TCPSocket 3310
 # Run as another user (clamd must be started by root for this option to work)
 # Default: don't drop privileges
 
-# Initialize supplementary group access (clamd must be started by root).
-# Default: no
-AllowSupplementaryGroups yes
-
 # Stop daemon when libclamav reports out of memory condition.
 #ExitOnOOM yes
 

freshclam.conf

@@ -54,10 +54,6 @@ LogSyslog no
 # Default: clamav (may depend on installation options)
 DatabaseOwner clamav
 
-# Initialize supplementary group access (freshclam must be started by root).
-# Default: no
-#AllowSupplementaryGroups yes
-
 # Use DNS to verify virus database version. Freshclam uses DNS TXT records
 # to verify database and software versions. With this directive you can change
 # the database verification domain.