Skip to content

Commit 49f3145

Browse files
committed
use official Rust Docker image and a fixed version instead of curling
1 parent 46124c9 commit 49f3145

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

build/ubuntu/Dockerfile.deps

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
FROM rust:1.63 as mls-test-cli-builder
2+
3+
# compile mls-test-cli tool
4+
RUN cd /tmp && \
5+
git clone https://github.com/wireapp/mls-test-cli && \
6+
cd mls-test-cli && \
7+
cargo build --release
8+
9+
110
FROM ubuntu:20.04 as cryptobox-builder
211

312
# compile cryptobox-c
@@ -10,14 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
1019
export SODIUM_USE_PKG_CONFIG=1 && \
1120
cargo build --release
1221

13-
# compile mls-test-cli tool
14-
# note: to make use of rustup's toolchain you need to prefix commands by . "$HOME/.cargo/env"
15-
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
16-
RUN cd /tmp && \
17-
git clone https://github.com/wireapp/mls-test-cli && \
18-
cd mls-test-cli && \
19-
. "$HOME/.cargo/env" && \
20-
cargo build --release
2122

2223
# Minimal dependencies for ubuntu-compiled, dynamically linked wire-server Haskell services
2324
FROM ubuntu:20.04
@@ -26,7 +27,7 @@ COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /u
2627

2728
# FUTUREWORK: only copy mls-test-cli executables if we are building an
2829
# integration test image
29-
COPY --from=cryptobox-builder /tmp/mls-test-cli/target/release/mls-test-cli /usr/bin
30+
COPY --from=mls-test-cli-builder /tmp/mls-test-cli/target/release/mls-test-cli /usr/bin
3031

3132
RUN export DEBIAN_FRONTEND=noninteractive && \
3233
apt-get update && \

0 commit comments

Comments
 (0)