Merge pull request #131 from stakwork/docker-build-test

Docker build test
stakwork · Dec 18, 2020 · 20800a6 · 20800a6
2 parents 3fc8bfb + 6464301
commit 20800a6
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 22 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,11 +2,7 @@ FROM node:12-buster-slim AS builder
 
 WORKDIR /relay
 RUN mkdir /relay/.lnd
-RUN touch /relay/connection_string.txt
-RUN chmod 777 /relay/connection_string.txt
-RUN cp /relay/config/app.json /relay/dist/config/app.json
-RUN cp /relay/config/config.json /relay/dist/config/config.json
-COPY . .
+COPY --chown=1000:1000 . .
 
 RUN apt-get update
 
@@ -16,6 +12,11 @@ RUN apt install -y g++ gcc libmcrypt-dev
 RUN npm install bcrypt
 RUN npm install
 
+RUN cp /relay/config/app.json /relay/dist/config/app.json
+RUN cp /relay/config/config.json /relay/dist/config/config.json
+
+RUN chown -R 1000:1000 /relay
+
 FROM node:12-buster-slim
 
 USER 1000

diff --git a/app.ts b/app.ts
@@ -5,7 +5,7 @@ import * as cookieParser from 'cookie-parser'
 import * as cors from 'cors'
 import logger from './src/utils/logger'
 import { pingHubInterval, checkInvitesHubInterval } from './src/hub'
-import { setupDatabase, setupDone } from './src/utils/setup'
+import { setupDatabase, setupDone, setupOwnerContact } from './src/utils/setup'
 import * as controllers from './src/controllers'
 import * as connect from './src/utils/connect'
 import * as socket from './src/utils/socket'
@@ -43,6 +43,7 @@ async function mainSetup() {
 }
 
 async function finishSetup() {
+	setupOwnerContact()
 	await network.initTribesSubscriptions()
 	if (config.hub_api_url) {
 		checkInvitesHubInterval(5000)

diff --git a/dist/app.js b/dist/app.js
diff --git a/dist/app.js.map b/dist/app.js.map
diff --git a/dist/src/controllers/index.js b/dist/src/controllers/index.js