-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to ubuntu 23.04 for clang-16, required for clambc-compiler 1.3.0
- Loading branch information
1 parent
a31fd3e
commit 78f2217
Showing
2 changed files
with
16 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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,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" "/" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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,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" "/" | ||
|
|
||
|
|
||