Merge pull request #88 from dappnode/dev

v0.1.17 hotfix
dappnode · Oct 29, 2018 · 58e02ed · 58e02ed
2 parents ffafc7e + b3ada70
commit 58e02ed
Show file tree

Hide file tree

Showing 28 changed files with 529 additions and 231 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@ build_*
 build/src/node_modules/
 build/src/mockFiles/
 build/src/db.json
+build/src/vpndb/
+build/src/vpndb.json
 .vscode
 uploader
 .gitignore
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as build
+FROM node:8.12.0-alpine as build
 
 RUN apk add --update --no-cache \
     build-base \
@@ -17,7 +17,7 @@ RUN npm install
 # Run the copy in two steps to cache the npm install
 COPY src .
 
-FROM alpine
+FROM alpine:3.8
 
 WORKDIR /usr/src/app
 
@@ -84,7 +84,8 @@ RUN chmod 755 check_upnp.sh
 
 RUN mkdir -p /usr/src/app/secrets
 # envs for init.sh -> node communication
-ENV DB_PATH /usr/src/app/secrets/db.json
+ENV DB_PATH /usr/src/app/secrets/vpndb.json
+ENV LOGIN_MSG_PATH /usr/src/app/loginMsgFile.txt
 ENV INSTALLATION_STATIC_IP /usr/src/app/config/static_ip
 ENV KEYPAIR_PATH /usr/src/app/secrets/keypair
 ENV CREDENTIALS_PATH /usr/src/app/secrets/chap-secrets