Skip to content

Commit a82fa0d

Browse files
committed
ci: Update dist-x86_64-musl to ubuntu:22.04
1 parent 69d56ab commit a82fa0d

File tree

1 file changed

+4
-6
lines changed
  • src/ci/docker/host-x86_64/dist-x86_64-musl

1 file changed

+4
-6
lines changed

src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile

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

3-
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++ \
56
make \
67
ninja-build \
@@ -11,6 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
1112
python3 \
1213
git \
1314
cmake \
15+
bzip2 \
1416
xz-utils \
1517
sudo \
1618
gdb \
@@ -21,10 +23,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
2123

2224
WORKDIR /build/
2325

24-
# Build cmake before musl toolchain, as we replace the compiler during that step.
25-
COPY scripts/cmake.sh /scripts/
26-
RUN /scripts/cmake.sh
27-
2826
COPY scripts/musl-toolchain.sh /build/
2927
# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
3028
RUN CFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \

0 commit comments

Comments
 (0)