v4.3.0 (#148)

Major updates
* Adding ClamAV 1.4.1
* Making ClamAV 1.4 the default

Build updates
* Using new /test executable

.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:
       -
@@ -64,7 +64,7 @@ jobs:
         name: Run tests
         id: docker_test
         run: |
-          docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test"
+          docker run --entrypoint /test ${{ env.TEST_TAG }}
       -
         name: Build and push
         id: docker_build

.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: .

0.104/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.4.14
+FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-clamav"
 

0.105/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.4.14
+FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-clamav"
 

1.1/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.14
+FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-clamav"
 

1.2/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.14
+FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-clamav"
 

1.2/overlay/tmp/CLAMAV_MINOR

@@ -1 +1 @@
-1.2.2
+1.2

1.2/overlay/tmp/CLAMAV_REVISION

@@ -1 +1 @@
-1.2
+1.2.2

1.4/ALPINE_MINOR

@@ -0,0 +1 @@
+3.21

1.4/Dockerfile

@@ -0,0 +1,18 @@
+FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.0
+
+LABEL org.opencontainers.image.source="https://github.com/bfren/docker-clamav"
+
+ARG BF_IMAGE
+ARG BF_PUBLISHING
+ARG BF_VERSION
+
+COPY ./overlay /
+COPY ./1.4/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

1.4/overlay/tmp/CLAMAV_BUILD

@@ -0,0 +1 @@
+1.4.1-r0

1.4/overlay/tmp/CLAMAV_MINOR

@@ -0,0 +1 @@
+1.4

1.4/overlay/tmp/CLAMAV_REVISION

@@ -0,0 +1 @@
+1.4.1

VERSION

@@ -1 +1 @@
-4.2.16
+4.3.0

VERSION_MINOR

@@ -1 +1 @@
-4.2
+4.3

generate-dockerfiles.sh

@@ -4,10 +4,10 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_VERSION="5.4.14"
+BASE_VERSION="5.5.0"
 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}"

run.sh

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

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 \
@@ -13,4 +13,4 @@ docker buildx build \
     -t ${TAG} \
     . \
     && \
-    docker run --entrypoint "/usr/bin/env" ${TAG} -i nu -c "use bf test ; test"
+    docker run --entrypoint /test ${TAG}