Adding ClamAV 1.4.1

Making ClamAV 1.4 the default
bfren · Dec 6, 2024 · 3a5af75 · 3a5af75
1 parent 732c41d
commit 3a5af75
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        clamav: [ "0.104", "0.105", "1.1", "1.2" ]
+        clamav: [ "0.104", "0.105", "1.1", "1.2", "1.4" ]
     runs-on: ubuntu-latest
     steps:
       -

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        clamav: [ "0.104", "0.105", "1.1", "1.2" ]
+        clamav: [ "0.104", "0.105", "1.1", "1.2", "1.4" ]
     runs-on: ubuntu-latest
     steps:
       -
@@ -90,7 +90,7 @@ jobs:
       -
         name: Build and push default tags
         id: docker_build_default
-        if: matrix.clamav == '1.2'
+        if: matrix.clamav == '1.4'
         uses: docker/build-push-action@v6
         with:
           context: .

diff --git a/1.2/overlay/tmp/CLAMAV_MINOR b/1.2/overlay/tmp/CLAMAV_MINOR
@@ -1 +1 @@
-1.2.2
+1.2
diff --git a/1.2/overlay/tmp/CLAMAV_REVISION b/1.2/overlay/tmp/CLAMAV_REVISION
@@ -1 +1 @@
-1.2
+1.2.2
diff --git a/1.4/ALPINE_MINOR b/1.4/ALPINE_MINOR
@@ -0,0 +1 @@
+3.21
diff --git a/1.4/Dockerfile b/1.4/Dockerfile
@@ -0,0 +1,18 @@
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.14
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-clamav"
+
+ARG BF_IMAGE
+ARG BF_PUBLISHING
+ARG BF_VERSION
+
+COPY ./overlay /
+COPY ./1.2/overlay /
+
+EXPOSE 3310
+
+ENV \
+    # the number of times per day freshclam will run to update definitions
+    BF_CLAMAV_FRESH_PER_DAY=12
+
+RUN bf-install
diff --git a/1.4/overlay/tmp/CLAMAV_BUILD b/1.4/overlay/tmp/CLAMAV_BUILD
@@ -0,0 +1 @@
+1.4.1-r0
diff --git a/1.4/overlay/tmp/CLAMAV_MINOR b/1.4/overlay/tmp/CLAMAV_MINOR
@@ -0,0 +1 @@
+1.4
diff --git a/1.4/overlay/tmp/CLAMAV_REVISION b/1.4/overlay/tmp/CLAMAV_REVISION
@@ -0,0 +1 @@
+1.4.1
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -7,7 +7,7 @@ docker pull bfren/alpine
 BASE_VERSION="5.4.14"
 echo "Base: ${BASE_VERSION}"
 
-CLAMAV_VERSIONS="0.104 0.105 1.1 1.2"
+CLAMAV_VERSIONS="0.104 0.105 1.1 1.2 1.4"
 for V in ${CLAMAV_VERSIONS} ; do
 
     echo "ClamAV ${V}"

diff --git a/run.sh b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 IMAGE=`cat VERSION`
-CLAMAV=${1:-1.2}
+CLAMAV=${1:-1.4}
 
 docker buildx build \
     --load \

diff --git a/test.sh b/test.sh
@@ -2,7 +2,7 @@
 
 IMAGE=clamav
 VERSION=`cat VERSION`
-CLAMAV=${1:-1.2}
+CLAMAV=${1:-1.4}
 TAG=${IMAGE}-test
 
 docker buildx build \