From 78f22176cd151640bd4c2474ee2167a0fb980f30 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Fri, 9 Feb 2024 19:38:18 -0500 Subject: [PATCH] Upgrade to ubuntu 23.04 for clang-16, required for clambc-compiler 1.3.0 --- .../0.105/ubuntu/Dockerfile | 18 ++++++++---------- .../unstable/ubuntu/Dockerfile | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/clamav-bytecode-compiler/0.105/ubuntu/Dockerfile b/clamav-bytecode-compiler/0.105/ubuntu/Dockerfile index 6ec780b..9e06fbc 100644 --- a/clamav-bytecode-compiler/0.105/ubuntu/Dockerfile +++ b/clamav-bytecode-compiler/0.105/ubuntu/Dockerfile @@ -1,7 +1,7 @@ # 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 " @@ -9,8 +9,8 @@ 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,11 +37,11 @@ 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:22.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" "/" diff --git a/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile b/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile index 6ec780b..9e06fbc 100644 --- a/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile +++ b/clamav-bytecode-compiler/unstable/ubuntu/Dockerfile @@ -1,7 +1,7 @@ # 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 " @@ -9,8 +9,8 @@ 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,11 +37,11 @@ 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:22.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" "/"