Skip to content

[FS-736] Add rusty-jwt-tools dependency to docker deps and builder #2686

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
battermann merged 2 commits into from
Sep 14, 2022
Merged

[FS-736] Add rusty-jwt-tools dependency to docker deps and builder #2686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c72b618
added rust dependency to docker deps and builder
battermann Sep 13, 2022
360eac5
changelog
battermann Sep 13, 2022
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
13 changes: 13 additions & 0 deletions build/ubuntu/Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,22 @@ RUN cd /tmp && \

RUN cd /tmp/mls-test-cli && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-gnu

FROM rust:1.63 as rusty-jwt-tools-builder

# compile rusty-jwt-tools
RUN cd /tmp && \
git clone https://github.com/wireapp/rusty-jwt-tools && \
cd rusty-jwt-tools && \
git checkout 6370cd556f03f6834d0b8043615ffaf0044ef1fa && \
git rev-parse HEAD

RUN cd /tmp/rusty-jwt-tools && cargo build --release --target x86_64-unknown-linux-gnu

FROM ${prebuilder}

COPY --from=mls-test-cli-builder /tmp/mls-test-cli/target/x86_64-unknown-linux-gnu/release/mls-test-cli /usr/bin/mls-test-cli
COPY --from=rusty-jwt-tools-builder /tmp/rusty-jwt-tools/target/x86_64-unknown-linux-gnu/release/librusty_jwt_tools.so /usr/lib
COPY --from=rusty-jwt-tools-builder /tmp/rusty-jwt-tools/target/x86_64-unknown-linux-gnu/release/librusty_jwt_tools_ffi.so /usr/lib

WORKDIR /

Expand Down
14 changes: 14 additions & 0 deletions build/ubuntu/Dockerfile.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,25 @@ RUN cd /tmp && \

RUN cd /tmp/mls-test-cli && RUSTFLAGS='-C target-feature=+crt-static' cargo build --release --target x86_64-unknown-linux-gnu

FROM rust:1.63 as rusty-jwt-tools-builder

# compile rusty-jwt-tools
RUN cd /tmp && \
git clone https://github.com/wireapp/rusty-jwt-tools && \
cd rusty-jwt-tools && \
git checkout 6370cd556f03f6834d0b8043615ffaf0044ef1fa && \
git rev-parse HEAD

RUN cd /tmp/rusty-jwt-tools && cargo build --release --target x86_64-unknown-linux-gnu


# Minimal dependencies for ubuntu-compiled, dynamically linked wire-server Haskell services
FROM ubuntu:20.04

COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib
COPY --from=mls-test-cli-builder /tmp/mls-test-cli/target/x86_64-unknown-linux-gnu/release/mls-test-cli /usr/bin/mls-test-cli
COPY --from=rusty-jwt-tools-builder /tmp/rusty-jwt-tools/target/x86_64-unknown-linux-gnu/release/librusty_jwt_tools.so /usr/lib
COPY --from=rusty-jwt-tools-builder /tmp/rusty-jwt-tools/target/x86_64-unknown-linux-gnu/release/librusty_jwt_tools_ffi.so /usr/lib

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
Expand Down
1 change: 1 addition & 0 deletions changelog.d/5-internal/pr-2686
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added rusty-jwt-tools to docker images