jshbrmn/braid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove explicit port

Browse Source
This commit is contained in:
Josh Burman 2020-01-30 14:59:25 -05:00
parent fb5533ce7a
commit d663afd8fe
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.docker-compose/Dockerfile
View File

@ -15,7 +15,4 @@ RUN npm install
# Bundle app source # Bundle app source
COPY . /app COPY . /app
ENV PORT 8443
EXPOSE 8443
CMD [ "node", "./dist/server/server.js" ] CMD [ "node", "./dist/server/server.js" ]

3
Dockerfile
View File

@ -15,7 +15,4 @@ RUN npm install
# Bundle app source # Bundle app source
COPY . /app COPY . /app
ENV PORT 8443
EXPOSE 8443
CMD [ "node", "./dist/server/server.js" ] CMD [ "node", "./dist/server/server.js" ]

5
README.md
View File

@ -26,7 +26,6 @@ braid:
environment: environment:
VIRTUAL_HOST: ysbraid.localhost VIRTUAL_HOST: ysbraid.localhost
HTTPS_METHOD: noredirect 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 * 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 * `tsc` transpiles the typescript in braid into javascript
* `compose build braid` builds the braid container based on the latest transpiled javascript files * `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 * `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` * 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:8443?token={token}` * 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) * 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: * you can generate a token for development in your local console (`app-console`) with the following commands:

2
docker-compose.yml
View File

@ -5,7 +5,5 @@ braid:
MEASURE_BASE_URL: http://admin.localhost MEASURE_BASE_URL: http://admin.localhost
dns: dns:
- 172.17.0.1 - 172.17.0.1
ports:
- "8443"
volumes: volumes:
- /apps/braid:/app - /apps/braid:/app

2
src/config/app.ts
View File

@ -3,7 +3,7 @@ module.exports = {
whitelist : (process.env.WHITELIST || "http://admin.localhost").split(','), whitelist : (process.env.WHITELIST || "http://admin.localhost").split(','),
secret : process.env.SECRET || "test", secret : process.env.SECRET || "test",
devToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImNsaWVudCI6InRlc3QiLCJjbGllbnRfdHlwZSI6InNpdGUiLCJ1c2VyX3R5cGUiOiJ1c2VyIiwidXNlcl9pZCI6MjAwLCJjaGFubmVsIjoidGVzdF9jaGFubmVsIn0sImF1ZCI6ImludGVybmFsIiwiaXNzIjoiWWFyZHN0aWNrIFNvZnR3YXJlIiwic3ViIjoiQnJhaWQgSldUIn0.5KNCov_EW1cycT4Ay0oSvk4Z4PHFedd3bWOyqkHHTBQ', devToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImNsaWVudCI6InRlc3QiLCJjbGllbnRfdHlwZSI6InNpdGUiLCJ1c2VyX3R5cGUiOiJ1c2VyIiwidXNlcl9pZCI6MjAwLCJjaGFubmVsIjoidGVzdF9jaGFubmVsIn0sImF1ZCI6ImludGVybmFsIiwiaXNzIjoiWWFyZHN0aWNrIFNvZnR3YXJlIiwic3ViIjoiQnJhaWQgSldUIn0.5KNCov_EW1cycT4Ay0oSvk4Z4PHFedd3bWOyqkHHTBQ',
port: process.env.PORT || 8443, port: process.env.PORT || 80,
hostname: process.env.HOSTNAME || 'ysbraid.localhost', hostname: process.env.HOSTNAME || 'ysbraid.localhost',
environment: process.env.ENVIRONMENT || 'development', environment: process.env.ENVIRONMENT || 'development',
log_level: process.env.LOG_LEVEL || 'debug', log_level: process.env.LOG_LEVEL || 'debug',