Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.3.0 #148

Merged
merged 5 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
-
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
-
Expand Down Expand Up @@ -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: .
Expand Down
2 changes: 1 addition & 1 deletion 0.104/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion 0.105/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion 1.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion 1.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion 1.2/overlay/tmp/CLAMAV_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.2
1.2
2 changes: 1 addition & 1 deletion 1.2/overlay/tmp/CLAMAV_REVISION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2
1.2.2
1 change: 1 addition & 0 deletions 1.4/ALPINE_MINOR
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.21
18 changes: 18 additions & 0 deletions 1.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions 1.4/overlay/tmp/CLAMAV_BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.4.1-r0
1 change: 1 addition & 0 deletions 1.4/overlay/tmp/CLAMAV_MINOR
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.4
1 change: 1 addition & 0 deletions 1.4/overlay/tmp/CLAMAV_REVISION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.4.1
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.16
4.3.0
2 changes: 1 addition & 1 deletion VERSION_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
4.3
4 changes: 2 additions & 2 deletions generate-dockerfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

IMAGE=`cat VERSION`
CLAMAV=${1:-1.2}
CLAMAV=${1:-1.4}

docker buildx build \
--load \
Expand Down
4 changes: 2 additions & 2 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

IMAGE=clamav
VERSION=`cat VERSION`
CLAMAV=${1:-1.2}
CLAMAV=${1:-1.4}
TAG=${IMAGE}-test

docker buildx build \
Expand All @@ -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}
Loading