diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps index 533e98d4b20..48d37b818ce 100644 --- a/build/ubuntu/Dockerfile.deps +++ b/build/ubuntu/Dockerfile.deps @@ -10,11 +10,19 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ export SODIUM_USE_PKG_CONFIG=1 && \ cargo build --release +FROM rust:1.63 as mls-test-cli-builder + +# compile mls-test-cli tool +RUN cd /tmp && \ + git clone https://github.com/wireapp/mls-test-cli + +RUN cd /tmp/mls-test-cli && RUSTFLAGS='-C target-feature=+crt-static' cargo install --bins --target x86_64-unknown-linux-gnu --path . # Minimal dependencies for ubuntu-compiled, dynamically linked wire-server Haskell services FROM ubuntu:20.04 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib +COPY --from=mls-test-cli-builder /usr/local/cargo/bin/mls-test-cli /usr/bin/mls-test-cli RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ diff --git a/changelog.d/5-internal/mls-test-cli-deps-image b/changelog.d/5-internal/mls-test-cli-deps-image new file mode 100644 index 00000000000..446f077b653 --- /dev/null +++ b/changelog.d/5-internal/mls-test-cli-deps-image @@ -0,0 +1 @@ +Add mls-test-cli to deps image