Browse Source
remove changes for local development
pull/1955/head
Stuart Heap
4 years ago
No known key found for this signature in database
GPG Key ID: C753450AB379AA25
2 changed files with
4 additions and
2 deletions
-
.dockerignore
-
docker/amd64/Dockerfile
|
|
@ -3,6 +3,7 @@ target |
|
|
|
|
|
|
|
|
# Data folder |
|
|
# Data folder |
|
|
data |
|
|
data |
|
|
|
|
|
.env |
|
|
.env.template |
|
|
.env.template |
|
|
.gitattributes |
|
|
.gitattributes |
|
|
|
|
|
|
|
|
@ -23,4 +24,4 @@ hooks |
|
|
tools |
|
|
tools |
|
|
|
|
|
|
|
|
# Web vault |
|
|
# Web vault |
|
|
#web-vault |
|
|
web-vault |
|
|
@ -22,6 +22,7 @@ |
|
|
# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 |
|
|
# $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 |
|
|
# [vaultwarden/web-vault:v2.21.1] |
|
|
# [vaultwarden/web-vault:v2.21.1] |
|
|
# |
|
|
# |
|
|
|
|
|
FROM vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 as vault |
|
|
|
|
|
|
|
|
########################## BUILD IMAGE ########################## |
|
|
########################## BUILD IMAGE ########################## |
|
|
FROM rust:1.53 as build |
|
|
FROM rust:1.53 as build |
|
|
@ -100,7 +101,7 @@ EXPOSE 3012 |
|
|
# and the binary from the "build" stage to the current stage |
|
|
# and the binary from the "build" stage to the current stage |
|
|
WORKDIR / |
|
|
WORKDIR / |
|
|
COPY Rocket.toml . |
|
|
COPY Rocket.toml . |
|
|
COPY ./web-vault/build ./web-vault |
|
|
COPY --from=vault /web-vault ./web-vault |
|
|
COPY --from=build /app/target/release/vaultwarden . |
|
|
COPY --from=build /app/target/release/vaultwarden . |
|
|
|
|
|
|
|
|
COPY docker/healthcheck.sh /healthcheck.sh |
|
|
COPY docker/healthcheck.sh /healthcheck.sh |
|
|
|
