mirror/libsignal
0
0
Fork 0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 03:52:17 +02:00
Code

Docker: use the rust-toolchain file instead of hardcoding a version

Browse Source
This commit is contained in:
Jordan Rose 2021-06-14 16:11:45 -07:00
parent ffd2fe1664
commit 3a3476b833
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/Dockerfile
View File

@ -60,8 +60,7 @@ RUN echo y | ./android-sdk/tools/bin/sdkmanager --sdk_root=${ANDROID_HOME} "p
# Rust setup...
# This should always match the version set in rust-toolchain
ARG RUST_TOOLCHAIN=nightly-2020-11-09
COPY ../rust-toolchain rust-toolchain
ARG RUSTUP_SHA=ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b
ARG CARGO_NDK_VERSION=1.0.0
ENV PATH="/home/libsignal/.cargo/bin:${PATH}"
@ -69,7 +68,7 @@ ENV PATH="/home/libsignal/.cargo/bin:${PATH}"
RUN curl -f https://static.rust-lang.org/rustup/archive/1.21.1/x86_64-unknown-linux-gnu/rustup-init -o /tmp/rustup-init \
&& echo "${RUSTUP_SHA} /tmp/rustup-init" | sha256sum -c - \
&& chmod a+x /tmp/rustup-init \
&& /tmp/rustup-init -y --profile minimal --default-toolchain "${RUST_TOOLCHAIN}" \
&& /tmp/rustup-init -y --profile minimal --default-toolchain "$(cat rust-toolchain)" \
&& rm -rf /tmp/rustup-init
RUN rustup target add armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android \