geforkt von mirrored/vaultwarden
Fetch Vault from upstream when building Docker image
Dieser Commit ist enthalten in:
Ursprung
b4a42054f9
Commit
818b511267
3 geänderte Dateien mit 39 neuen und 1 gelöschten Zeilen
29
Dockerfile
29
Dockerfile
|
@ -1,6 +1,33 @@
|
||||||
# Using multistage build:
|
# Using multistage build:
|
||||||
# https://docs.docker.com/develop/develop-images/multistage-build/
|
# https://docs.docker.com/develop/develop-images/multistage-build/
|
||||||
# https://whitfin.io/speeding-up-rust-docker-builds/
|
# https://whitfin.io/speeding-up-rust-docker-builds/
|
||||||
|
####################### VAULT BUILD IMAGE #######################
|
||||||
|
FROM node:9-alpine as vault
|
||||||
|
|
||||||
|
ENV VAULT_VERSION "1.26.0"
|
||||||
|
ENV URL "https://github.com/bitwarden/web/archive/v${VAULT_VERSION}.tar.gz"
|
||||||
|
|
||||||
|
RUN apk add --update-cache --upgrade \
|
||||||
|
curl \
|
||||||
|
git \
|
||||||
|
tar \
|
||||||
|
&& npm install -g \
|
||||||
|
gulp-cli \
|
||||||
|
gulp
|
||||||
|
|
||||||
|
RUN mkdir /web-build \
|
||||||
|
&& cd /web-build \
|
||||||
|
&& curl -L "${URL}" | tar -xvz --strip-components=1
|
||||||
|
|
||||||
|
WORKDIR /web-build
|
||||||
|
|
||||||
|
COPY /web-vault/settings.Production.json /web-build/
|
||||||
|
|
||||||
|
RUN git config --global url."https://github.com/".insteadOf ssh://git@github.com/ \
|
||||||
|
&& npm install \
|
||||||
|
&& gulp dist:selfHosted \
|
||||||
|
&& mv dist /web-vault
|
||||||
|
|
||||||
########################## BUILD IMAGE ##########################
|
########################## BUILD IMAGE ##########################
|
||||||
# We need to use the Rust build image, because
|
# We need to use the Rust build image, because
|
||||||
# we need the Rust compiler and Cargo tooling
|
# we need the Rust compiler and Cargo tooling
|
||||||
|
@ -53,7 +80,7 @@ EXPOSE 80
|
||||||
# Copies the files from the context (env file and web-vault)
|
# Copies the files from the context (env file and web-vault)
|
||||||
# and the binary from the "build" stage to the current stage
|
# and the binary from the "build" stage to the current stage
|
||||||
COPY .env .
|
COPY .env .
|
||||||
COPY web-vault ./web-vault
|
COPY --from=vault /web-vault ./web-vault
|
||||||
COPY --from=build app/target/release/bitwarden_rs .
|
COPY --from=build app/target/release/bitwarden_rs .
|
||||||
|
|
||||||
# Configures the startup!
|
# Configures the startup!
|
||||||
|
|
|
@ -40,6 +40,8 @@ cargo build
|
||||||
```
|
```
|
||||||
|
|
||||||
## How to update the web-vault used
|
## How to update the web-vault used
|
||||||
|
If you're using docker image, you can just update `VAULT_VERSION` variable in Dockerfile and rebuild the image.
|
||||||
|
|
||||||
Install `node.js` and either `yarn` or `npm` (usually included with node)
|
Install `node.js` and either `yarn` or `npm` (usually included with node)
|
||||||
|
|
||||||
Clone the web-vault outside the project:
|
Clone the web-vault outside the project:
|
||||||
|
|
9
web-vault/settings.Production.json
Normale Datei
9
web-vault/settings.Production.json
Normale Datei
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"appSettings": {
|
||||||
|
"apiUri": "/api",
|
||||||
|
"identityUri": "/identity",
|
||||||
|
"iconsUri": "/icons",
|
||||||
|
"stripeKey": "",
|
||||||
|
"braintreeKey": ""
|
||||||
|
}
|
||||||
|
}
|
Laden …
In neuem Issue referenzieren