commit 9c46d2f72d9d0752ba023c97529f5c449be94bda parent 69e624f82bd26b9b63784cdb89fb1ac5ee82169e Author: Daniel GarcĂa <dani-garcia@users.noreply.github.com> Date: Fri, 27 Apr 2018 01:12:46 +0200 Merge pull request #8 from mprasil/master Move settings out of web-vault Diffstat:
M | .gitignore | | | 5 | ++--- |
M | Dockerfile | | | 2 | +- |
R | web-vault/settings.Production.json -> docker/settings.Production.json | | | 0 |
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git 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 @@ -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://git@github.com/ \ && npm install \ diff --git a/web-vault/settings.Production.json b/docker/settings.Production.json