mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-12-22 21:55:20 +00:00
resources: Add musl tools and toolchain to the Dockerfile
And fix the libssl install for building it with musl. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
ad9374bd68
commit
33b0e15804
@ -21,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq \
|
|||||||
wget \
|
wget \
|
||||||
sudo \
|
sudo \
|
||||||
mtools \
|
mtools \
|
||||||
|
musl-tools \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
flex \
|
flex \
|
||||||
@ -36,11 +37,20 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -yq \
|
|||||||
dosfstools \
|
dosfstools \
|
||||||
cpio \
|
cpio \
|
||||||
bsdtar \
|
bsdtar \
|
||||||
|
gcc-multilib \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Fix the libssl-dev install
|
||||||
|
RUN cp /usr/include/x86_64-linux-gnu/openssl/opensslconf.h /usr/include/openssl/
|
||||||
|
ENV OPENSSL_DIR=/usr/lib/x86_64-linux-gnu/
|
||||||
|
ENV OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu/
|
||||||
|
ENV OPENSSL_INCLUDE_DIR=/usr/include/
|
||||||
|
|
||||||
# Install the rust toolchain
|
# Install the rust toolchain
|
||||||
RUN nohup curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \
|
RUN nohup curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN" \
|
||||||
|
&& rustup target add x86_64-unknown-linux-musl --toolchain "$RUST_TOOLCHAIN" \
|
||||||
|
&& rustup toolchain add $RUST_TOOLCHAIN-x86_64-unknown-linux-musl \
|
||||||
&& rustup component add rustfmt \
|
&& rustup component add rustfmt \
|
||||||
&& rustup component add clippy \
|
&& rustup component add clippy \
|
||||||
&& cargo install cargo-audit \
|
&& cargo install cargo-audit \
|
||||||
|
Loading…
Reference in New Issue
Block a user