Skip to content

Commit 982bd3f

Browse files
committed
docker: Add clang-tidy-17 to builder deps
Add clang-tidy-17 to the builder image. Signed-off-by: Jarno Rajahalme <[email protected]>
1 parent 030d6dc commit 982bd3f

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

.github/workflows/build-envoy-image-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
build-and-push-prs:
1818
timeout-minutes: 360
1919
name: Build and push multi-arch images
20-
runs-on: ubuntu-latest-64-cores-256gb
20+
runs-on: ubuntu-22.04-64-cores-256gb
2121
steps:
2222
- name: Set up Docker Buildx
2323
uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0

Dockerfile.builder

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#
2-
# Builder dependencies. This takes a long time to build from scratch!
3-
# Also note that if build fails due to C++ internal error or similar,
4-
# it is possible that the image build needs more RAM than available by
5-
# default on non-Linux docker installs.
2+
# Builder dependencies.
3+
#
64
FROM docker.io/library/ubuntu:22.04@sha256:ed1544e454989078f5dec1bfdabd8c5cc9c48e0705d07b678ab6ae3fb61952d2 AS base
75
LABEL maintainer="[email protected]"
86
ARG TARGETARCH
@@ -13,9 +11,10 @@ ENV TZ=Etc/UTC
1311
ENV GO_VERSION=1.23.6
1412

1513
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
16-
RUN apt-get update && \
17-
apt-get upgrade -y --no-install-recommends && \
18-
apt-get install -y --no-install-recommends \
14+
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
15+
apt-get update -y -q && \
16+
apt-get upgrade -y -q --no-install-recommends && \
17+
apt-get install -y -q --no-install-recommends \
1918
ca-certificates \
2019
# Multi-arch cross-compilation packages
2120
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross binutils-aarch64-linux-gnu \
@@ -28,9 +27,9 @@ RUN apt-get update && \
2827
software-properties-common && \
2928
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
3029
apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" && \
31-
apt-get update && \
32-
apt-get install -y --no-install-recommends \
33-
clang-17 clang-tools-17 llvm-17-dev lldb-17 lld-17 clang-format-17 libc++-17-dev libc++abi-17-dev && \
30+
apt-get update -y -q && \
31+
apt-get install -y -q --no-install-recommends \
32+
clang-17 clang-tidy-17 clang-tools-17 llvm-17-dev lldb-17 lld-17 clang-format-17 libc++-17-dev libc++abi-17-dev && \
3433
apt-get purge --auto-remove && \
3534
apt-get clean && \
3635
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

0 commit comments

Comments
 (0)