Skip to content

Remove old crypto-cli tool from the ubuntu image #2538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcapriotti merged 1 commit into from
Jul 5, 2022
Merged

Remove old crypto-cli tool from the ubuntu image #2538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions build/ubuntu/Dockerfile.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
export SODIUM_USE_PKG_CONFIG=1 && \
cargo build --release

# FUTUREWORK: remove core-crypto once #2508 is merged
# compile legacy core-crypto cli tool
RUN cd /tmp && \
apt-get install -y libssl-dev && \
git clone -b cli https://github.com/wireapp/core-crypto && \
cd core-crypto/cli && \
cargo build --release

# compile mls-test-cli tool
RUN cd /tmp && \
git clone https://github.com/wireapp/mls-test-cli && \
Expand All @@ -29,9 +21,8 @@ FROM ubuntu:20.04

COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib

# FUTUREWORK: only copy crypto-cli and mls-test-cli executables if we are building an
# FUTUREWORK: only copy mls-test-cli executables if we are building an
# integration test image
COPY --from=cryptobox-builder /tmp/core-crypto/cli/target/release/crypto-cli /usr/bin
COPY --from=cryptobox-builder /tmp/mls-test-cli/target/release/mls-test-cli /usr/bin

RUN export DEBIAN_FRONTEND=noninteractive && \
Expand Down
1 change: 1 addition & 0 deletions changelog.d/5-internal/remove-crypto-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove old crypto-cli tool from the ubuntu image