Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Dockerfiles to build clang-18 images #2814

Merged
merged 3 commits into from
Aug 16, 2024
Merged

Update Dockerfiles to build clang-18 images #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cff97d6
Dockerfile.clang: upgrade to clang-18
mtardy Aug 7, 2024
c7a2978
clang-format: remove duplicate settings in config
mtardy Aug 14, 2024
c486db1
Dockerfile.clang-format: upgrade to clang-format-18
mtardy Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,9 @@ SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInAngles: false
SpacesInContainerLiterals: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpacesInSquareBrackets: false
TabWidth: 8
UseTab: Always
12 changes: 6 additions & 6 deletions Dockerfile.clang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM docker.io/library/ubuntu:22.04@sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508
FROM docker.io/library/ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30
RUN apt-get update && apt-get install -y --no-install-recommends \
clang-15 libclang-common-15-dev libclang-cpp15 \
libllvm15 llvm-15-linker-tools libclang1-15 \
llvm-15 llvm-15-runtime llvm-15-linker-tools make \
clang-18 libclang-common-18-dev libclang-cpp18 \
libllvm18 llvm-18-linker-tools libclang1-18 \
llvm-18 llvm-18-runtime llvm-18-linker-tools make \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
RUN ln -vsnf /usr/lib/llvm-15/bin/clang /usr/bin/clang
RUN ln -vsnf /usr/lib/llvm-15/bin/llc /usr/bin/llc
RUN ln -vsnf /usr/lib/llvm-18/bin/clang /usr/bin/clang
RUN ln -vsnf /usr/lib/llvm-18/bin/llc /usr/bin/llc
6 changes: 3 additions & 3 deletions Dockerfile.clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM docker.io/library/ubuntu:22.04@sha256:0bced47fffa3361afa981854fcabcd4577cd43cebbb808cea2b1f33a3dd7f508
FROM docker.io/library/ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30

RUN apt-get -y update
RUN apt-get -y install clang-format-14
RUN ln -s /bin/clang-format-14 /bin/clang-format
RUN apt-get -y install clang-format-18
RUN ln -s /bin/clang-format-18 /bin/clang-format

USER 1000
WORKDIR /tetragon
Expand Down
Loading