From e245e965baaef161c7407f5eead1115641d27a4f Mon Sep 17 00:00:00 2001
From: Nick Fox <nick@foxsec.net>
Date: Sat, 15 Dec 2018 22:45:39 -0500
Subject: [PATCH] Fix broken rebase

---
 BUILD.md          | 3 +++
 Dockerfile.alpine | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/BUILD.md b/BUILD.md
index 89bac2d..1e35113 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -21,6 +21,8 @@ A compiled version of the web vault can be downloaded from [dani-garcia/bw_web_b
 
 If you prefer to compile it manually, follow these steps:
 
+*Note: building the Vault needs ~1.5GB of RAM. On systems like a RaspberryPI with 1GB or less, please [enable swapping](https://www.tecmint.com/create-a-linux-swap-file/) or build it on a more powerful machine and copy the directory from there. This much memory is only needed for building it, running bitwarden_rs with vault needs only about 10MB of RAM.*
+
 - Clone the git repository at [bitwarden/web](https://github.com/bitwarden/web) and checkout the latest release tag (e.g. v2.1.1):
 ```sh
 # clone the repository
@@ -37,6 +39,7 @@ git apply /path/to/bitwarden_rs/docker/set-vault-baseurl.patch
 ```
 
 - Then, build the Vault:
+
 ```sh
 npm run sub:init
 npm install
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index ddc8549..ff098a1 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -20,7 +20,7 @@ RUN ls
 
 ########################## BUILD IMAGE  ##########################
 # Musl build image for statically compiled binary
-FROM clux/muslrust:nightly-2018-11-30 as build
+FROM clux/muslrust:nightly-2018-12-01 as build
 
 ENV USER "root"
 
@@ -30,6 +30,8 @@ WORKDIR /app
 # To avoid copying unneeded files, use .dockerignore
 COPY . .
 
+RUN rustup target add x86_64-unknown-linux-musl
+
 # Build
 RUN cargo build --release