File tree Expand file tree Collapse file tree 1 file changed +10
-9
lines changed Expand file tree Collapse file tree 1 file changed +10
-9
lines changed Original file line number Diff line number Diff line change
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
+
1
10
FROM ubuntu:20.04 as cryptobox-builder
2
11
3
12
# compile cryptobox-c
@@ -10,14 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
10
19
export SODIUM_USE_PKG_CONFIG=1 && \
11
20
cargo build --release
12
21
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
21
22
22
23
# Minimal dependencies for ubuntu-compiled, dynamically linked wire-server Haskell services
23
24
FROM ubuntu:20.04
@@ -26,7 +27,7 @@ COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /u
26
27
27
28
# FUTUREWORK: only copy mls-test-cli executables if we are building an
28
29
# 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
30
31
31
32
RUN export DEBIAN_FRONTEND=noninteractive && \
32
33
apt-get update && \
You can’t perform that action at this time.
0 commit comments