saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-05-22 11:33:57 +00:00
Code Activity

Merge branch 'master' into rocket-0.4

Browse source 
# Conflicts:
#	src/api/core/mod.rs
This commit is contained in:
Daniel García 2018-11-09 16:06:24 +01:00
commit 4638786507
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
3 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.aarch64
View file

@ -79,7 +79,7 @@ RUN cargo build --release --target=aarch64-unknown-linux-gnu -v
######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image
# because we already have a binary built
FROM resin/aarch64-debian:stretch
FROM balenalib/aarch64-debian:stretch
ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80