From d663afd8fe0b93732ad1a5b2e7cc7a205a604504 Mon Sep 17 00:00:00 2001 From: Josh Burman Date: Thu, 30 Jan 2020 14:59:25 -0500 Subject: [PATCH] remove explicit port --- .docker-compose/Dockerfile | 3 --- Dockerfile | 3 --- README.md | 5 ++--- docker-compose.yml | 2 -- src/config/app.ts | 2 +- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.docker-compose/Dockerfile b/.docker-compose/Dockerfile index 40e04ba..c5fa404 100755 --- a/.docker-compose/Dockerfile +++ b/.docker-compose/Dockerfile @@ -15,7 +15,4 @@ RUN npm install # Bundle app source COPY . /app -ENV PORT 8443 -EXPOSE 8443 - CMD [ "node", "./dist/server/server.js" ] diff --git a/Dockerfile b/Dockerfile index 2728f8d..f489647 100755 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,4 @@ RUN npm install # Bundle app source COPY . /app -ENV PORT 8443 -EXPOSE 8443 - CMD [ "node", "./dist/server/server.js" ] diff --git a/README.md b/README.md index 3410a78..3676aac 100755 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ braid: environment: VIRTUAL_HOST: ysbraid.localhost HTTPS_METHOD: noredirect - VIRTUAL_PORT: 8443 ``` * once complete and confirmed to function, create a new PR for the measure repo, with the new tag and await ultimate judgement @@ -38,8 +37,8 @@ braid: * `tsc` transpiles the typescript in braid into javascript * `compose build braid` builds the braid container based on the latest transpiled javascript files * `comopose up -d` builds the braid container based on the files in the braid folder, overriding the default braid build container -* you can see if braid is running by typing in `https://ysbraid.localhost:8443` -* to connect to braid you need to use the url `wss://ysbraid.localhost:8443?token={token}` +* you can see if braid is running by typing in `https://ysbraid.localhost` +* to connect to braid you need to use the url `wss://ysbraid.localhost?token={token}` * the token is generated in the application that you're connecting to the braid app with (currently only measure has an implementation for this) * you can generate a token for development in your local console (`app-console`) with the following commands: diff --git a/docker-compose.yml b/docker-compose.yml index 98f581d..a688d37 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,5 @@ braid: MEASURE_BASE_URL: http://admin.localhost dns: - 172.17.0.1 - ports: - - "8443" volumes: - /apps/braid:/app diff --git a/src/config/app.ts b/src/config/app.ts index 58dafbf..9d50ae3 100644 --- a/src/config/app.ts +++ b/src/config/app.ts @@ -3,7 +3,7 @@ module.exports = { whitelist : (process.env.WHITELIST || "http://admin.localhost").split(','), secret : process.env.SECRET || "test", devToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImNsaWVudCI6InRlc3QiLCJjbGllbnRfdHlwZSI6InNpdGUiLCJ1c2VyX3R5cGUiOiJ1c2VyIiwidXNlcl9pZCI6MjAwLCJjaGFubmVsIjoidGVzdF9jaGFubmVsIn0sImF1ZCI6ImludGVybmFsIiwiaXNzIjoiWWFyZHN0aWNrIFNvZnR3YXJlIiwic3ViIjoiQnJhaWQgSldUIn0.5KNCov_EW1cycT4Ay0oSvk4Z4PHFedd3bWOyqkHHTBQ', - port: process.env.PORT || 8443, + port: process.env.PORT || 80, hostname: process.env.HOSTNAME || 'ysbraid.localhost', environment: process.env.ENVIRONMENT || 'development', log_level: process.env.LOG_LEVEL || 'debug',