saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-07-19 10:38:24 +00:00
Code Activity

Move rustup target before cargo build. Thanks to @dani-garcia!

Browse source 
Note from @dani-garcia:

> I don't think this is doing anything right now because the target is probably
> installed already.
This commit is contained in:
Robin Schneider 2019-12-31 15:38:55 +01:00
commit 43adcde094
No known key found for this signature in database
GPG key ID: A81E8006DC95EFE6
6 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docker/Dockerfile.j2
View file

@ -176,6 +176,13 @@ ENV OPENSSL_INCLUDE_DIR="/usr/include/arm-linux-gnueabi"
ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabi"
{% endif -%}
{% if "alpine" in target_file %}
RUN rustup target add x86_64-unknown-linux-musl
{% elif "aarch64" in target_file %}
RUN rustup target add aarch64-unknown-linux-gnu
{% endif %}
# Builds your dependencies and removes the
# dummy project, except the target folder
# This folder contains the compiled dependencies
@ -189,16 +196,11 @@ COPY . .
# Make sure that we actually build the project
RUN touch src/main.rs
{% if "alpine" in target_file %}
RUN rustup target add x86_64-unknown-linux-musl
{% endif %}
# Builds again, this time it'll just be
# your actual source files being built
{% if "amd64" in target_file %}
RUN cargo build --features ${DB} --release
{% elif "aarch64" in target_file %}
RUN rustup target add aarch64-unknown-linux-gnu
RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu
{% endif %}