Merge pull request #42 from Cisco-Talos/clambc-compiler-1.3.0

Clambc compiler 1.4.0

clamav-bytecode-compiler/0.105/ubuntu/Dockerfile → clamav-bytecode-compiler/1.4/ubuntu/Dockerfile

@@ -1,16 +1,16 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Copyright (C) 2021-2023 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
-FROM registry.hub.docker.com/library/ubuntu:20.04 AS builder
+FROM registry.hub.docker.com/library/ubuntu:23.04 AS builder
 
 LABEL Maintainer="ClamAV bugs <[email protected]>"
 
 WORKDIR /src
 COPY . /src
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV CC=clang-8
-ENV CXX=clang++-8
+ENV CC=clang-16
+ENV CXX=clang++-16
 
 RUN apt-get update -y && \
  apt-get install -y \
@@ -19,15 +19,13 @@ RUN apt-get update -y && \
  binutils \
  git \
  python3 \
- python3-distutils \
- python3-pip \
+ python3-pytest \
  cmake \
  make \
- clang-8 \
+ clang-16 \
  clamav \
  && \
  rm -rf /var/lib/apt/lists/* && \
- python3 -m pip install pytest && \
  mkdir build && \
  cd build && \
  cmake .. -G "Unix Makefiles" \
@@ -39,17 +37,17 @@ RUN apt-get update -y && \
  make DESTDIR="/clambc" install && \
  ctest -V
 
-FROM registry.hub.docker.com/library/ubuntu:20.04
+FROM registry.hub.docker.com/library/ubuntu:23.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV CC=clang-8
-ENV CXX=clang++-8
+ENV CC=clang-16
+ENV CXX=clang++-16
 
 COPY --from=builder "/clambc" "/"
 
 RUN apt-get -y update && \
  apt install -y \
  python3 \
- clang-8 \
+ clang-16 \
  && \
  rm -rf /var/lib/apt/lists/*

clamav-bytecode-compiler/0.105/ubuntu/Jenkinsfile → clamav-bytecode-compiler/1.4/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.4.0',  description: 'The repository branch for this build'),
+ string(name: 'FULL_VERSION', defaultValue: '1.4.0',  description: 'Full version in X.Y.Z format'),
+ string(name: 'FEATURE_VERSION', defaultValue: '1.4',  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(),
@@ -55,7 +55,7 @@ node('docker') {
 
  // Make sure we have the latest base image.
  sh """
- docker pull ubuntu:20.04
+ docker pull ubuntu:23.04
  """
 
  // Login to docker hub

clamav-bytecode-compiler/unstable/ubuntu/Dockerfile

@@ -1,16 +1,16 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Copyright (C) 2021-2023 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
-FROM registry.hub.docker.com/library/ubuntu:20.04 AS builder
+FROM registry.hub.docker.com/library/ubuntu:23.04 AS builder
 
 LABEL Maintainer="ClamAV bugs <[email protected]>"
 
 WORKDIR /src
 COPY . /src
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV CC=clang-8
-ENV CXX=clang++-8
+ENV CC=clang-16
+ENV CXX=clang++-16
 
 RUN apt-get update -y && \
  apt-get install -y \
@@ -19,15 +19,13 @@ RUN apt-get update -y && \
  binutils \
  git \
  python3 \
- python3-distutils \
- python3-pip \
+ python3-pytest \
  cmake \
  make \
- clang-8 \
+ clang-16 \
  clamav \
  && \
  rm -rf /var/lib/apt/lists/* && \
- python3 -m pip install pytest && \
  mkdir build && \
  cd build && \
  cmake .. -G "Unix Makefiles" \
@@ -39,17 +37,17 @@ RUN apt-get update -y && \
  make DESTDIR="/clambc" install && \
  ctest -V
 
-FROM registry.hub.docker.com/library/ubuntu:20.04
+FROM registry.hub.docker.com/library/ubuntu:23.04
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV CC=clang-8
-ENV CXX=clang++-8
+ENV CC=clang-16
+ENV CXX=clang++-16
 
 COPY --from=builder "/clambc" "/"
 
 RUN apt-get -y update && \
  apt install -y \
  python3 \
- clang-8 \
+ clang-16 \
  && \
  rm -rf /var/lib/apt/lists/*

clamav-bytecode-compiler/unstable/ubuntu/Jenkinsfile

@@ -50,7 +50,7 @@ node('docker') {
  [[envVar: 'DOCKER_USER', vaultKey: 'username'],[envVar: 'DOCKER_PASSWD', vaultKey: 'password']]]]]) {
  // Make sure we have the latest base image.
  sh """
- docker pull ubuntu:20.04
+ docker pull ubuntu:23.04
  """
 
  // Login to docker hub