aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Prasil <[email protected]>2018-04-26 23:40:38 +0100
committerMiroslav Prasil <[email protected]>2018-04-26 23:40:38 +0100
commitf00732ddc5cc94f734c5e9aa9f5e8e696515d221 (patch)
treee62207a8cb6e05eca2dcc9c33c6e6b2222e700a4
parent69e624f82bd26b9b63784cdb89fb1ac5ee82169e (diff)
downloadvaultwarden-f00732ddc5cc94f734c5e9aa9f5e8e696515d221.tar.gz
vaultwarden-f00732ddc5cc94f734c5e9aa9f5e8e696515d221.zip
Move settings out of web-vault
-rw-r--r--.gitignore3
-rw-r--r--Dockerfile2
-rw-r--r--docker/settings.Production.json (renamed from web-vault/settings.Production.json)0
3 files changed, 2 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index f730ce71..77a95200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,4 @@ data
# .env
# Web vault
-web-vault
-!web-vault/settings.Production.json \ No newline at end of file
+web-vault \ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 758fd813..30d9fba1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN mkdir /web-build \
WORKDIR /web-build
-COPY /web-vault/settings.Production.json /web-build/
+COPY /docker/settings.Production.json /web-build/
RUN git config --global url."https://github.com/".insteadOf ssh://[email protected]/ \
&& npm install \
diff --git a/web-vault/settings.Production.json b/docker/settings.Production.json
index a3e5e911..a3e5e911 100644
--- a/web-vault/settings.Production.json
+++ b/docker/settings.Production.json