From 872f61e6577f15d1bba9abdfe20de4c079e688c4 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Fri, 9 Feb 2024 19:39:50 -0500 Subject: [PATCH] Update clambc-compiler version to 1.3.0 --- clamav-bytecode-compiler/{0.105 => 1.3}/ubuntu/Dockerfile | 4 ++-- clamav-bytecode-compiler/{0.105 => 1.3}/ubuntu/Jenkinsfile | 6 +++--- clamav-bytecode-compiler/unstable/ubuntu/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename clamav-bytecode-compiler/{0.105 => 1.3}/ubuntu/Dockerfile (94%) rename clamav-bytecode-compiler/{0.105 => 1.3}/ubuntu/Jenkinsfile (96%) diff --git a/clamav-bytecode-compiler/0.105/ubuntu/Dockerfile b/clamav-bytecode-compiler/1.3/ubuntu/Dockerfile similarity index 94% rename from clamav-bytecode-compiler/0.105/ubuntu/Dockerfile rename to clamav-bytecode-compiler/1.3/ubuntu/Dockerfile index 9e06fbc..1c55d9c 100644 --- a/clamav-bytecode-compiler/0.105/ubuntu/Dockerfile +++ b/clamav-bytecode-compiler/1.3/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN apt-get update -y && \ make DESTDIR="/clambc" install && \ ctest -V -FROM registry.hub.docker.com/library/ubuntu:22.04 +FROM registry.hub.docker.com/library/ubuntu:23.04 ENV DEBIAN_FRONTEND=noninteractive ENV CC=clang-16 @@ -48,6 +48,6 @@ COPY --from=builder "/clambc" "/" RUN apt-get -y update && \ apt install -y \ python3 \ - clang-8 \ + clang-16 \ && \ rm -rf /var/lib/apt/lists/* diff --git a/clamav-bytecode-compiler/0.105/ubuntu/Jenkinsfile b/clamav-bytecode-compiler/1.3/ubuntu/Jenkinsfile similarity index 96% rename from clamav-bytecode-compiler/0.105/ubuntu/Jenkinsfile rename to clamav-bytecode-compiler/1.3/ubuntu/Jenkinsfile index ab18890..ee0a543 100644 --- a/clamav-bytecode-compiler/0.105/ubuntu/Jenkinsfile +++ b/clamav-bytecode-compiler/1.3/ubuntu/Jenkinsfile @@ -6,9 +6,9 @@ properties([ string(name: 'NAMESPACE', defaultValue: 'clamav', description: 'The docker namespace to use'), string(name: 'IMAGE_NAME', defaultValue: 'clambc-compiler', description: 'The docker image name to use'), string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav-bytecode-compiler.git', description: 'The repository from which to build'), - string(name: 'BRANCH', defaultValue: 'rel/0.105.0', description: 'The repository branch for this build'), - string(name: 'FULL_VERSION', defaultValue: '0.105.0', description: 'Full version in X.Y.Z format'), - string(name: 'FEATURE_VERSION', defaultValue: '0.105', description: 'Feature version in X.Y format'), + string(name: 'BRANCH', defaultValue: 'rel/1.3.0', 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(), diff --git a/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile b/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile index 9e06fbc..1c55d9c 100644 --- a/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile +++ b/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN apt-get update -y && \ make DESTDIR="/clambc" install && \ ctest -V -FROM registry.hub.docker.com/library/ubuntu:22.04 +FROM registry.hub.docker.com/library/ubuntu:23.04 ENV DEBIAN_FRONTEND=noninteractive ENV CC=clang-16 @@ -48,6 +48,6 @@ COPY --from=builder "/clambc" "/" RUN apt-get -y update && \ apt install -y \ python3 \ - clang-8 \ + clang-16 \ && \ rm -rf /var/lib/apt/lists/*