Skip to content

Commit a4bbd75

Browse files
authored
feat: support clang v21 (#106)
1 parent 1ad20f2 commit a4bbd75

File tree

3 files changed

+15
-30
lines changed

3 files changed

+15
-30
lines changed

Dockerfile.all

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN set -e \
1818
apt-get --no-install-recommends -y install clang-format-$CLANG_VERSION clang-tidy-$CLANG_VERSION; done \
1919
&& rm -rf /var/lib/apt/lists/*
2020

21-
ENV CLANG_VERSIONS="20 19 18 17 16 15 14 13"
21+
ENV CLANG_VERSIONS="21 20 19 18 17 16 15 14 13"
2222

2323
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2424

@@ -33,7 +33,7 @@ RUN set -e \
3333
&& rm llvm.sh \
3434
&& rm -rf /var/lib/apt/lists/*
3535

36-
ENV CLANG_VERSIONS="20 19 18 17 16 15 14 13 12 11 10 9"
36+
ENV CLANG_VERSIONS="21 20 19 18 17 16 15 14 13 12 11 10 9"
3737
# Integrity testing
3838
RUN set -e \
3939
&& for VERSION in $CLANG_VERSIONS; do \

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ You can access all available Clang Tools Docker images via [Docker Hub registry
1212

1313
## Supported Tags and Dockerfile links
1414

15-
* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supports versions of clang-tools includes `20`, `19`, `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
15+
* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supports versions of clang-tools includes `21`, `20`, `19`, `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
16+
* [`21`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
17+
* [`21-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
1618
* [`20`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
1719
* [`20-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
1820
* [`19`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)

docker-bake.hcl

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
group "default" {
33
targets = [
44
"all",
5+
"21",
6+
"21-alpine",
57
"20",
68
"20-alpine",
79
"19",
@@ -50,14 +52,14 @@ target "all" {
5052

5153
target "clang-tools" {
5254
matrix = {
53-
tgt = ["20"]
55+
tgt = ["21"]
5456
}
5557
name = "${tgt}"
5658
dockerfile = "Dockerfile"
5759
context = "."
5860
args = {
59-
# https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-20&searchon=names
60-
BASE_IMAGE="ubuntu:plucky"
61+
# https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-21&searchon=names
62+
BASE_IMAGE="ubuntu:questing"
6163
CLANG_VERSION="${tgt}",
6264
}
6365
tags = [
@@ -70,14 +72,14 @@ target "clang-tools" {
7072

7173
target "clang-tools" {
7274
matrix = {
73-
tgt = ["19"]
75+
tgt = ["20", "19"]
7476
}
7577
name = "${tgt}"
7678
dockerfile = "Dockerfile"
7779
context = "."
7880
args = {
79-
# https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-19&searchon=names
80-
BASE_IMAGE="ubuntu:oracular"
81+
# https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-20&searchon=names
82+
BASE_IMAGE="ubuntu:plucky"
8183
CLANG_VERSION="${tgt}",
8284
}
8385
tags = [
@@ -90,7 +92,7 @@ target "clang-tools" {
9092

9193
target "clang-tools" {
9294
matrix = {
93-
tgt = ["18"]
95+
tgt = ["18", "17", "16", "15", "14"]
9496
}
9597
name = "${tgt}"
9698
dockerfile = "Dockerfile"
@@ -108,25 +110,6 @@ target "clang-tools" {
108110
output = ["type=image"]
109111
}
110112

111-
target "clang-tools" {
112-
matrix = {
113-
tgt = ["17", "16", "15", "14"]
114-
}
115-
name = "${tgt}"
116-
dockerfile = "Dockerfile"
117-
context = "."
118-
args = {
119-
BASE_IMAGE="ubuntu:24.10"
120-
CLANG_VERSION="${tgt}",
121-
}
122-
tags = [
123-
"${DOCKER_REPO}:${tgt}",
124-
"${GITHUB_REPO}:${tgt}"
125-
]
126-
platforms = ["linux/amd64", "linux/arm64"]
127-
output = ["type=image"]
128-
}
129-
130113
target "clang-tools" {
131114
matrix = {
132115
tgt = ["13", "12", "11"]
@@ -167,7 +150,7 @@ target "clang-tools" {
167150

168151
target "clang-tools" {
169152
matrix = {
170-
tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine"]
153+
tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine", "21-alpine"]
171154
}
172155
name = "${tgt}"
173156
dockerfile = "Dockerfile.alpine"

0 commit comments

Comments
 (0)