Skip to content

Commit 72ab854

Browse files
committed
update docker image
1 parent 39418df commit 72ab854

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

ci/docker/Dockerfile

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
ARG \
44
RUST_VERSION= \
55
RUST_NIGHTLY_VERSION= \
66
GOLANG_VERSION=1.21.3 \
7-
NODE_MAJOR=18 \
7+
NODE_MAJOR=22 \
88
SCCACHE_VERSION=v0.8.1 \
9-
GRCOV_VERSION=v0.8.18
9+
GRCOV_VERSION=v0.8.19 \
10+
LLVM_VERSION=18
1011

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

@@ -23,6 +24,9 @@ ENV \
2324
CARGO_HOME=/usr/local/cargo \
2425
PATH="$PATH:/usr/local/cargo/bin"
2526

27+
# llvm
28+
ENV PATH="/usr/lib/llvm-${LLVM_VERSION}/bin:$PATH"
29+
2630
RUN \
2731
if [ -z "$RUST_VERSION" ]; then echo "ERROR: The RUST_VERSION argument is required!" && exit 1; fi && \
2832
if [ -z "$RUST_NIGHTLY_VERSION" ]; then echo "ERROR: The RUST_NIGHTLY_VERSION argument is required!" && exit 1; fi && \
@@ -39,7 +43,6 @@ RUN \
3943
ca-certificates \
4044
curl \
4145
gnupg \
42-
lld \
4346
cmake \
4447
# docs
4548
mscgen \
@@ -48,13 +51,18 @@ RUN \
4851
libudev-dev \
4952
pkg-config \
5053
zlib1g-dev \
51-
llvm \
52-
clang \
5354
cmake \
5455
make \
5556
libprotobuf-dev \
5657
protobuf-compiler \
5758
&& \
59+
# llvm
60+
apt install lsb-release wget software-properties-common gnupg -y && \
61+
wget https://apt.llvm.org/llvm.sh && \
62+
chmod u+x llvm.sh && \
63+
./llvm.sh $LLVM_VERSION && \
64+
rm ./llvm.sh && \
65+
clang --version && \
5866
# buildkite
5967
curl -fsSL https://keys.openpgp.org/vks/v1/by-fingerprint/32A37959C2FA5C3C99EFBC32A79206696452D198 | gpg --dearmor -o /usr/share/keyrings/buildkite-agent-archive-keyring.gpg && \
6068
echo "deb [signed-by=/usr/share/keyrings/buildkite-agent-archive-keyring.gpg] https://apt.buildkite.com/buildkite-agent stable main" | tee /etc/apt/sources.list.d/buildkite-agent.list && \

0 commit comments

Comments
 (0)