mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Update dist-x86_64-musl to ubuntu:22.04

Browse Source
This commit is contained in:
Josh Stone 2023-07-20 16:08:41 -07:00
parent 69d56abfbd
commit a82fa0d1c7
1 changed files with 4 additions and 6 deletions

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

@ -1,6 +1,7 @@
FROM ubuntu:20.04
FROM ubuntu:22.04
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
g++ \
make \
ninja-build \
@ -11,6 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
python3 \
git \
cmake \
bzip2 \
xz-utils \
sudo \
gdb \
@ -21,10 +23,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
WORKDIR /build/
# Build cmake before musl toolchain, as we replace the compiler during that step.
COPY scripts/cmake.sh /scripts/
RUN /scripts/cmake.sh
COPY scripts/musl-toolchain.sh /build/
# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
RUN CFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \