Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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: 2 additions & 2 deletions Dockerfile.all
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN set -e \
apt-get --no-install-recommends -y install clang-format-$CLANG_VERSION clang-tidy-$CLANG_VERSION; done \
&& rm -rf /var/lib/apt/lists/*

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

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

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

ENV CLANG_VERSIONS="20 19 18 17 16 15 14 13 12 11 10 9"
ENV CLANG_VERSIONS="21 20 19 18 17 16 15 14 13 12 11 10 9"
# Integrity testing
RUN set -e \
&& for VERSION in $CLANG_VERSIONS; do \
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ You can access all available Clang Tools Docker images via [Docker Hub registry

## Supported Tags and Dockerfile links

* [`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`)
* [`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`)
* [`21`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
* [`21-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
* [`20`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
* [`20-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
* [`19`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
Expand Down
26 changes: 24 additions & 2 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
group "default" {
targets = [
"all",
"21",
"21-alpine",
"20",
"20-alpine",
"19",
Expand Down Expand Up @@ -48,6 +50,26 @@ target "all" {
output = ["type=image"]
}

target "clang-tools" {
matrix = {
tgt = ["21"]
}
name = "${tgt}"
dockerfile = "Dockerfile"
context = "."
args = {
# https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-21&searchon=names
BASE_IMAGE="ubuntu:questing"
CLANG_VERSION="${tgt}",
}
tags = [
"${DOCKER_REPO}:${tgt}",
"${GITHUB_REPO}:${tgt}"
]
platforms = ["linux/amd64", "linux/arm64"]
output = ["type=image"]
}

target "clang-tools" {
matrix = {
tgt = ["20"]
Expand Down Expand Up @@ -77,7 +99,7 @@ target "clang-tools" {
context = "."
args = {
# https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-19&searchon=names
BASE_IMAGE="ubuntu:oracular"
BASE_IMAGE="ubuntu:plucky"
CLANG_VERSION="${tgt}",
}
tags = [
Expand Down Expand Up @@ -167,7 +189,7 @@ target "clang-tools" {

target "clang-tools" {
matrix = {
tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine"]
tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine", "21-alpine"]
}
name = "${tgt}"
dockerfile = "Dockerfile.alpine"
Expand Down
Loading