From 26502e2bdfe1f8647d73d0842291d2baa99afbc9 Mon Sep 17 00:00:00 2001 From: barry Date: Fri, 7 Jun 2019 14:57:39 +0200 Subject: [PATCH] show config on startup --- docker/portal-srv/Dockerfile | 7 +++++-- src/portal-srv/config.js | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/portal-srv/Dockerfile b/docker/portal-srv/Dockerfile index 91dfa20..6f1d0a2 100644 --- a/docker/portal-srv/Dockerfile +++ b/docker/portal-srv/Dockerfile @@ -13,8 +13,11 @@ COPY src/portal-srv/ . # final image FROM node:carbon-alpine -## install bash -#RUN apk add bash docker +## install ssh +RUN apk add --no-cache \ + openssh-client \ + ca-certificates \ + bash WORKDIR /usr/app diff --git a/src/portal-srv/config.js b/src/portal-srv/config.js index 7535234..4e8e372 100644 --- a/src/portal-srv/config.js +++ b/src/portal-srv/config.js @@ -1,6 +1,7 @@ const path = require('path') const CFG = { + quiet: process.env.QUIET || false, port: process.env.PORT || 8889, arpCmd: process.env.ARP_CMD || 'arp -n', redirectTo: process.env.REDIRECT_TO || 'http://eca.aero', @@ -8,7 +9,6 @@ const CFG = { home: process.env.WEBAPP_HOME || path.join(__dirname, './webapp/default'), portal: process.env.WEBAPP_PORTAL || path.join(__dirname, './webapp/portal'), }, - quiet: process.env.QUIET || false, domains: [ 'apple.com', 'google.com', @@ -16,5 +16,7 @@ const CFG = { ] } +console.log('### CONFIG') +console.dir(CFG) module.exports = CFG \ No newline at end of file