saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-10 02:35:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move dpkg --add-architecture before the first apt call

Browse Source 
Thanks to @dani-garcia for the review!
This commit is contained in:
Robin Schneider
2019-12-31 15:17:31 +01:00
parent 43aa75dc89
commit 0f0e5876ae
7 changed files with 66 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
docker/Dockerfile.j2
View File

@@ -87,6 +87,18 @@ RUN rustup set profile minimal
ENV USER "root"
{% endif %}
{% if "aarch64" in target_file or "armv" in target_file %}
# Install required build libs for {{ package_arch_name }} architecture.
RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \
/etc/apt/sources.list.d/deb-src.list \
&& dpkg --add-architecture {{ package_arch_name }} \
&& apt-get update \
&& apt-get install -y \
--no-install-recommends \
libssl-dev{{ package_arch_prefix }} \
libc6-dev{{ package_arch_prefix }}
{% endif -%}
{% if "aarch64" in target_file %}
RUN apt-get update \
&& apt-get install -y \
@@ -143,19 +155,6 @@ RUN apt-get update && apt-get install -y \
RUN USER=root cargo new --bin app
WORKDIR /app
{% if "aarch64" in target_file or "armv" in target_file %}
# Install required build libs for {{ package_arch_name }} architecture.
RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \
/etc/apt/sources.list.d/deb-src.list \
&& dpkg --add-architecture {{ package_arch_name }} \
&& apt-get update \
&& apt-get install -y \
--no-install-recommends \
libssl-dev{{ package_arch_prefix }} \
libc6-dev{{ package_arch_prefix }}
{% endif -%}
# Copies over *only* your manifests and build files
COPY ./Cargo.* ./
COPY ./rust-toolchain ./rust-toolchain