Move mls-test-cli from deps image to builder image

Author: smatting

build/ubuntu/Dockerfile.builder

@@ -1,6 +1,17 @@
 ARG prebuilder=quay.io/wire/ubuntu20-prebuilder
 
+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 .
+
 FROM ${prebuilder}
+
+COPY --from=mls-test-cli-builder /usr/local/cargo/bin/mls-test-cli /usr/bin/mls-test-cli
+
 WORKDIR /
 
 # Download stack indices and compile/cache dependencies to speed up subsequent

build/ubuntu/Dockerfile.deps

@@ -1,12 +1,3 @@
-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 && \
-    cd mls-test-cli && \
-    cargo build --release
-
-
 FROM ubuntu:20.04 as cryptobox-builder
 
 # compile cryptobox-c
@@ -25,10 +16,6 @@ FROM ubuntu:20.04
 
 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib
 
-# FUTUREWORK: only copy mls-test-cli executables if we are building an
-# integration test image
-COPY --from=mls-test-cli-builder /tmp/mls-test-cli/target/release/mls-test-cli /usr/bin
-
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get install -y \