diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index ac4018b..5eea475 100644 --- 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 index 49d7808..6820661 100644 --- 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 index d2d61a7..ea710ab 100644 --- a/1.2/overlay/tmp/CLAMAV_MINOR +++ b/1.2/overlay/tmp/CLAMAV_MINOR @@ -1 +1 @@ -1.2.2 \ No newline at end of file +1.2 \ No newline at end of file diff --git a/1.2/overlay/tmp/CLAMAV_REVISION b/1.2/overlay/tmp/CLAMAV_REVISION index ea710ab..d2d61a7 100644 --- a/1.2/overlay/tmp/CLAMAV_REVISION +++ b/1.2/overlay/tmp/CLAMAV_REVISION @@ -1 +1 @@ -1.2 \ No newline at end of file +1.2.2 \ No newline at end of file diff --git a/1.4/ALPINE_MINOR b/1.4/ALPINE_MINOR new file mode 100644 index 0000000..f297023 --- /dev/null +++ b/1.4/ALPINE_MINOR @@ -0,0 +1 @@ +3.21 \ No newline at end of file diff --git a/1.4/Dockerfile b/1.4/Dockerfile new file mode 100644 index 0000000..4b5b27c --- /dev/null +++ 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 new file mode 100644 index 0000000..3a44f61 --- /dev/null +++ b/1.4/overlay/tmp/CLAMAV_BUILD @@ -0,0 +1 @@ +1.4.1-r0 \ No newline at end of file diff --git a/1.4/overlay/tmp/CLAMAV_MINOR b/1.4/overlay/tmp/CLAMAV_MINOR new file mode 100644 index 0000000..840ca8c --- /dev/null +++ b/1.4/overlay/tmp/CLAMAV_MINOR @@ -0,0 +1 @@ +1.4 \ No newline at end of file diff --git a/1.4/overlay/tmp/CLAMAV_REVISION b/1.4/overlay/tmp/CLAMAV_REVISION new file mode 100644 index 0000000..13175fd --- /dev/null +++ b/1.4/overlay/tmp/CLAMAV_REVISION @@ -0,0 +1 @@ +1.4.1 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 89c1d03..a891442 100755 --- 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 index edf519c..ce0d7f5 100644 --- 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 index adcfd13..4b7ddb1 100644 --- 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 \