Fix broken rebase
This commit is contained in:
parent
4910b14d57
commit
e245e965ba
3
BUILD.md
3
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:
|
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):
|
- Clone the git repository at [bitwarden/web](https://github.com/bitwarden/web) and checkout the latest release tag (e.g. v2.1.1):
|
||||||
```sh
|
```sh
|
||||||
# clone the repository
|
# clone the repository
|
||||||
|
@ -37,6 +39,7 @@ git apply /path/to/bitwarden_rs/docker/set-vault-baseurl.patch
|
||||||
```
|
```
|
||||||
|
|
||||||
- Then, build the Vault:
|
- Then, build the Vault:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
npm run sub:init
|
npm run sub:init
|
||||||
npm install
|
npm install
|
||||||
|
|
|
@ -20,7 +20,7 @@ RUN ls
|
||||||
|
|
||||||
########################## BUILD IMAGE ##########################
|
########################## BUILD IMAGE ##########################
|
||||||
# Musl build image for statically compiled binary
|
# 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"
|
ENV USER "root"
|
||||||
|
|
||||||
|
@ -30,6 +30,8 @@ WORKDIR /app
|
||||||
# To avoid copying unneeded files, use .dockerignore
|
# To avoid copying unneeded files, use .dockerignore
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
RUN rustup target add x86_64-unknown-linux-musl
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue