From b844fd496a267eba87760a3b7342bfa622c4d200 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Mon, 5 Feb 2024 14:53:41 -0500 Subject: [PATCH] Add ClamAV 1.3, remove ClamAV 1.1 ClamAV 1.1 is no longer supported (not LTS and past EOL). ClamAV 1.3 is ready for release. --- clamav/{1.1 => 1.3}/alpine/Dockerfile | 0 clamav/{1.1 => 1.3}/alpine/Jenkinsfile | 8 ++++---- clamav/{1.1 => 1.3}/alpine/scripts/clamdcheck.sh | 0 .../alpine/scripts/docker-entrypoint-unprivileged.sh | 0 clamav/{1.1 => 1.3}/alpine/scripts/docker-entrypoint.sh | 0 clamav/{1.1 => 1.3}/alpine/scripts/update_db_image.sh | 0 clamav/{1.1 => 1.3}/debian/Dockerfile | 0 clamav/{1.1 => 1.3}/debian/Jenkinsfile | 8 ++++---- clamav/{1.1 => 1.3}/debian/scripts/clamdcheck.sh | 0 .../debian/scripts/docker-entrypoint-unprivileged.sh | 0 clamav/{1.1 => 1.3}/debian/scripts/docker-entrypoint.sh | 0 clamav/{1.1 => 1.3}/debian/scripts/update_db_image.sh | 0 12 files changed, 8 insertions(+), 8 deletions(-) rename clamav/{1.1 => 1.3}/alpine/Dockerfile (100%) rename clamav/{1.1 => 1.3}/alpine/Jenkinsfile (97%) rename clamav/{1.1 => 1.3}/alpine/scripts/clamdcheck.sh (100%) rename clamav/{1.1 => 1.3}/alpine/scripts/docker-entrypoint-unprivileged.sh (100%) rename clamav/{1.1 => 1.3}/alpine/scripts/docker-entrypoint.sh (100%) rename clamav/{1.1 => 1.3}/alpine/scripts/update_db_image.sh (100%) rename clamav/{1.1 => 1.3}/debian/Dockerfile (100%) rename clamav/{1.1 => 1.3}/debian/Jenkinsfile (97%) rename clamav/{1.1 => 1.3}/debian/scripts/clamdcheck.sh (100%) rename clamav/{1.1 => 1.3}/debian/scripts/docker-entrypoint-unprivileged.sh (100%) rename clamav/{1.1 => 1.3}/debian/scripts/docker-entrypoint.sh (100%) rename clamav/{1.1 => 1.3}/debian/scripts/update_db_image.sh (100%) diff --git a/clamav/1.1/alpine/Dockerfile b/clamav/1.3/alpine/Dockerfile similarity index 100% rename from clamav/1.1/alpine/Dockerfile rename to clamav/1.3/alpine/Dockerfile diff --git a/clamav/1.1/alpine/Jenkinsfile b/clamav/1.3/alpine/Jenkinsfile similarity index 97% rename from clamav/1.1/alpine/Jenkinsfile rename to clamav/1.3/alpine/Jenkinsfile index a55ef45..c962d04 100644 --- a/clamav/1.1/alpine/Jenkinsfile +++ b/clamav/1.3/alpine/Jenkinsfile @@ -6,10 +6,10 @@ properties([ string(name: 'NAMESPACE', defaultValue: 'clamav', description: 'The docker namespace to use'), string(name: 'IMAGE_NAME', defaultValue: 'clamav', description: 'The docker image name to use'), string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'), - string(name: 'BRANCH', defaultValue: 'rel/1.1', description: 'The repository branch for this build'), - string(name: 'FULL_VERSION', defaultValue: '1.1.3', description: 'Full version in X.Y.Z format'), - string(name: 'FEATURE_VERSION', defaultValue: '1.1', description: 'Feature version in X.Y format'), - booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'), + string(name: 'BRANCH', defaultValue: 'rel/1.3', description: 'The repository branch for this build'), + string(name: 'FULL_VERSION', defaultValue: '1.3.0', description: 'Full version in X.Y.Z format'), + string(name: 'FEATURE_VERSION', defaultValue: '1.3', description: 'Feature version in X.Y format'), + booleanParam(name: 'IS_LATEST', defaultValue: true, description: 'If "true", will also publish to :latest, and :stable tags.'), ]), disableConcurrentBuilds(), buildDiscarder(logRotator( diff --git a/clamav/1.1/alpine/scripts/clamdcheck.sh b/clamav/1.3/alpine/scripts/clamdcheck.sh similarity index 100% rename from clamav/1.1/alpine/scripts/clamdcheck.sh rename to clamav/1.3/alpine/scripts/clamdcheck.sh diff --git a/clamav/1.1/alpine/scripts/docker-entrypoint-unprivileged.sh b/clamav/1.3/alpine/scripts/docker-entrypoint-unprivileged.sh similarity index 100% rename from clamav/1.1/alpine/scripts/docker-entrypoint-unprivileged.sh rename to clamav/1.3/alpine/scripts/docker-entrypoint-unprivileged.sh diff --git a/clamav/1.1/alpine/scripts/docker-entrypoint.sh b/clamav/1.3/alpine/scripts/docker-entrypoint.sh similarity index 100% rename from clamav/1.1/alpine/scripts/docker-entrypoint.sh rename to clamav/1.3/alpine/scripts/docker-entrypoint.sh diff --git a/clamav/1.1/alpine/scripts/update_db_image.sh b/clamav/1.3/alpine/scripts/update_db_image.sh similarity index 100% rename from clamav/1.1/alpine/scripts/update_db_image.sh rename to clamav/1.3/alpine/scripts/update_db_image.sh diff --git a/clamav/1.1/debian/Dockerfile b/clamav/1.3/debian/Dockerfile similarity index 100% rename from clamav/1.1/debian/Dockerfile rename to clamav/1.3/debian/Dockerfile diff --git a/clamav/1.1/debian/Jenkinsfile b/clamav/1.3/debian/Jenkinsfile similarity index 97% rename from clamav/1.1/debian/Jenkinsfile rename to clamav/1.3/debian/Jenkinsfile index ef57b1c..349ebf3 100644 --- a/clamav/1.1/debian/Jenkinsfile +++ b/clamav/1.3/debian/Jenkinsfile @@ -6,10 +6,10 @@ properties([ string(name: 'NAMESPACE', defaultValue: 'clamav', description: 'The docker namespace to use'), string(name: 'IMAGE_NAME', defaultValue: 'clamav-debian', description: 'The docker image name to use'), string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'), - string(name: 'BRANCH', defaultValue: 'rel/1.1', description: 'The repository branch for this build'), - string(name: 'FULL_VERSION', defaultValue: '1.1.3', description: 'Full version in X.Y.Z format'), - string(name: 'FEATURE_VERSION', defaultValue: '1.1', description: 'Feature version in X.Y format'), - booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'), + string(name: 'BRANCH', defaultValue: 'rel/1.3', description: 'The repository branch for this build'), + string(name: 'FULL_VERSION', defaultValue: '1.3.0', description: 'Full version in X.Y.Z format'), + string(name: 'FEATURE_VERSION', defaultValue: '1.3', description: 'Feature version in X.Y format'), + booleanParam(name: 'IS_LATEST', defaultValue: true, description: 'If "true", will also publish to :latest, and :stable tags.'), ]), disableConcurrentBuilds(), buildDiscarder(logRotator( diff --git a/clamav/1.1/debian/scripts/clamdcheck.sh b/clamav/1.3/debian/scripts/clamdcheck.sh similarity index 100% rename from clamav/1.1/debian/scripts/clamdcheck.sh rename to clamav/1.3/debian/scripts/clamdcheck.sh diff --git a/clamav/1.1/debian/scripts/docker-entrypoint-unprivileged.sh b/clamav/1.3/debian/scripts/docker-entrypoint-unprivileged.sh similarity index 100% rename from clamav/1.1/debian/scripts/docker-entrypoint-unprivileged.sh rename to clamav/1.3/debian/scripts/docker-entrypoint-unprivileged.sh diff --git a/clamav/1.1/debian/scripts/docker-entrypoint.sh b/clamav/1.3/debian/scripts/docker-entrypoint.sh similarity index 100% rename from clamav/1.1/debian/scripts/docker-entrypoint.sh rename to clamav/1.3/debian/scripts/docker-entrypoint.sh diff --git a/clamav/1.1/debian/scripts/update_db_image.sh b/clamav/1.3/debian/scripts/update_db_image.sh similarity index 100% rename from clamav/1.1/debian/scripts/update_db_image.sh rename to clamav/1.3/debian/scripts/update_db_image.sh