Use rust image to build mls-test-cli (#2611)

* Use rustup to build mls-test-cli * use official Rust Docker image and a fixed version instead of curling Co-authored-by: Stefan Berthold <[email protected]>
wireapp · Aug 15, 2022 · bfaa99a · bfaa99a
1 parent 13b0d3e
commit bfaa99a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps
@@ -1,3 +1,12 @@
+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
@@ -10,11 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     export SODIUM_USE_PKG_CONFIG=1 && \
     cargo build --release
 
-# compile mls-test-cli tool
-RUN cd /tmp && \
-  git clone https://github.com/wireapp/mls-test-cli && \
-  cd mls-test-cli && \
-  cargo build --release
 
 # Minimal dependencies for ubuntu-compiled, dynamically linked wire-server Haskell services
 FROM ubuntu:20.04
@@ -23,7 +27,7 @@ COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /u
 
 # FUTUREWORK: only copy mls-test-cli executables if we are building an
 # integration test image
-COPY --from=cryptobox-builder /tmp/mls-test-cli/target/release/mls-test-cli /usr/bin
+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 && \