From 904a94604e1c7f30c84e9bf0998445e59ff6adb1 Mon Sep 17 00:00:00 2001
From: Alex Skrypnyk <alex@drevops.com>
Date: Mon, 4 Nov 2024 08:18:21 +1100
Subject: [PATCH] Updated to ClamAV to `1.4.1` and explicitly set the platform.
 (#1443)

---
 .docker/clamav.dockerfile                                 | 2 +-
 .vortex/tests/bats/fixtures/docker-compose.env.json       | 1 +
 .vortex/tests/bats/fixtures/docker-compose.env_local.json | 1 +
 .vortex/tests/bats/fixtures/docker-compose.env_mod.json   | 1 +
 .vortex/tests/bats/fixtures/docker-compose.noenv.json     | 1 +
 docker-compose.yml                                        | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.docker/clamav.dockerfile b/.docker/clamav.dockerfile
index 66c1d801d..78b4b7dfd 100644
--- a/.docker/clamav.dockerfile
+++ b/.docker/clamav.dockerfile
@@ -11,7 +11,7 @@
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/commons
 FROM uselagoon/commons:24.10.0 AS commons
 
-FROM clamav/clamav:1.4.0
+FROM clamav/clamav:1.4.1
 
 COPY --from=commons /lagoon /lagoon
 COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
diff --git a/.vortex/tests/bats/fixtures/docker-compose.env.json b/.vortex/tests/bats/fixtures/docker-compose.env.json
index 49a3b2228..5c1c6d68d 100644
--- a/.vortex/tests/bats/fixtures/docker-compose.env.json
+++ b/.vortex/tests/bats/fixtures/docker-compose.env.json
@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",
diff --git a/.vortex/tests/bats/fixtures/docker-compose.env_local.json b/.vortex/tests/bats/fixtures/docker-compose.env_local.json
index 49a3b2228..5c1c6d68d 100644
--- a/.vortex/tests/bats/fixtures/docker-compose.env_local.json
+++ b/.vortex/tests/bats/fixtures/docker-compose.env_local.json
@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",
diff --git a/.vortex/tests/bats/fixtures/docker-compose.env_mod.json b/.vortex/tests/bats/fixtures/docker-compose.env_mod.json
index 33240c9e6..2faa6e947 100644
--- a/.vortex/tests/bats/fixtures/docker-compose.env_mod.json
+++ b/.vortex/tests/bats/fixtures/docker-compose.env_mod.json
@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",
diff --git a/.vortex/tests/bats/fixtures/docker-compose.noenv.json b/.vortex/tests/bats/fixtures/docker-compose.noenv.json
index c87e61c03..b420522b2 100644
--- a/.vortex/tests/bats/fixtures/docker-compose.noenv.json
+++ b/.vortex/tests/bats/fixtures/docker-compose.noenv.json
@@ -99,6 +99,7 @@
             "networks": {
                 "default": null
             },
+            "platform": "linux/amd64",
             "ports": [
                 {
                     "mode": "ingress",
diff --git a/docker-compose.yml b/docker-compose.yml
index 0a181b7eb..ccd83ab33 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -201,6 +201,7 @@ services:
     build:
       context: .
       dockerfile: .docker/clamav.dockerfile
+    platform: linux/amd64
     ports:
       - "3310" # Find port on host with `docker compose port clamav 3310`.
     environment: