From 635a48514fad1f279379c954361bc493d64f7f0a Mon Sep 17 00:00:00 2001
From: Stuart Heap <sheap13@gmail.com>
Date: Wed, 1 Sep 2021 17:38:19 +0200
Subject: [PATCH] remove changes for local development

---
 .dockerignore           | 3 ++-
 docker/amd64/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 6bc2dbdd..69f51d2a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,7 @@ target
 
 # Data folder
 data
+.env
 .env.template
 .gitattributes
 
@@ -23,4 +24,4 @@ hooks
 tools
 
 # Web vault
-#web-vault
+web-vault
\ No newline at end of file
diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile
index 8737ad5a..70d9c8f7 100644
--- a/docker/amd64/Dockerfile
+++ b/docker/amd64/Dockerfile
@@ -22,6 +22,7 @@
 #     $ docker image inspect --format "{{.RepoTags}}" vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5
 #     [vaultwarden/web-vault:v2.21.1]
 #
+FROM vaultwarden/web-vault@sha256:29a4fa7bf3790fff9d908b02ac5a154913491f4bf30c95b87b06d8cf1c5516b5 as vault
 
 ########################## BUILD IMAGE  ##########################
 FROM rust:1.53 as build
@@ -100,7 +101,7 @@ EXPOSE 3012
 # and the binary from the "build" stage to the current stage
 WORKDIR /
 COPY Rocket.toml .
-COPY ./web-vault/build ./web-vault
+COPY --from=vault /web-vault ./web-vault
 COPY --from=build /app/target/release/vaultwarden .
 
 COPY docker/healthcheck.sh /healthcheck.sh