[UPGRADE] - Docker - ClamAv 0.105 -> 1.1

apache · Jul 20, 2023 · a37ae8a · a37ae8a
1 parent b508c8a
commit a37ae8a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/third-party/clamav/docker-compose.yml b/third-party/clamav/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - james
 
   clamav:
-    image: clamav/clamav:0.105
+    image: clamav/clamav:1.1
     networks:
       - james
 

diff --git a/third-party/clamav/src/test/java/org/apache/james/clamav/DockerClamAV.java b/third-party/clamav/src/test/java/org/apache/james/clamav/DockerClamAV.java
@@ -20,24 +20,25 @@
 package org.apache.james.clamav;
 
 import java.time.Duration;
+import java.util.UUID;
 
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 public class DockerClamAV {
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("clamav/clamav");
-    private static final String DEFAULT_TAG = "0.105";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("clamav/clamav").withTag("1.1");
     private static final int DEFAULT_PORT = 3310;
 
     private final GenericContainer<?> container;
 
     public DockerClamAV() {
-        this.container = new GenericContainer<>(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG))
+        this.container = new GenericContainer<>(DEFAULT_IMAGE_NAME)
             .withExposedPorts(DEFAULT_PORT)
             .withEnv("CLAMAV_NO_FRESHCLAMD", "true")
             .withEnv("CLAMAV_NO_MILTERD", "true")
-            .waitingFor(new LogMessageWaitStrategy().withRegEx(".*clamd started.*\\n").withTimes(1)
+            .withCreateContainerCmdModifier(createContainerCmd -> createContainerCmd.withName("james-clamav-test-" + UUID.randomUUID()))
+            .waitingFor(Wait.forHealthcheck()
                 .withStartupTimeout(Duration.ofMinutes(5)));
     }
 

diff --git a/third-party/rspamd/docker-compose-distributed.yml b/third-party/rspamd/docker-compose-distributed.yml
@@ -95,7 +95,7 @@ services:
       - james
 
   clamav:
-    image: clamav/clamav:0.105
+    image: clamav/clamav:1.1
     networks:
       - james
 

diff --git a/third-party/rspamd/docker-compose.yml b/third-party/rspamd/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       - "debug"
 
   clamav:
-    image: clamav/clamav:0.105
+    image: clamav/clamav:1.1
 
   rspamd:
     depends_on:

diff --git a/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerClamAV.java b/third-party/rspamd/src/test/java/org/apache/james/rspamd/DockerClamAV.java
@@ -28,14 +28,13 @@
 import org.testcontainers.utility.DockerImageName;
 
 public class DockerClamAV {
-    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("clamav/clamav");
-    private static final String DEFAULT_TAG = "0.105";
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("clamav/clamav").withTag("1.1");
     private static final int DEFAULT_PORT = 3310;
 
     private final GenericContainer<?> container;
 
     public DockerClamAV(Network network) {
-        this.container = new GenericContainer<>(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG))
+        this.container = new GenericContainer<>(DEFAULT_IMAGE_NAME)
             .withExposedPorts(DEFAULT_PORT)
             .withEnv("CLAMAV_NO_FRESHCLAMD", "true")
             .withEnv("CLAMAV_NO_MILTERD", "true")