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

Merge branch 'release/1.2.3'

Browse Source
This commit is contained in:
Josh Burman 2020-02-21 16:50:47 -05:00
commit 9d00ddde96
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile
View File

@ -5,24 +5,27 @@ help:
repo=yardstick repo=yardstick
project=braid project=braid
tag=$(shell git rev-parse --short=7 HEAD)
branch=$(shell git rev-parse --abbrev-ref HEAD) branch=$(shell git rev-parse --abbrev-ref HEAD)
version=$(shell git describe --exact-match --tags $(git log -n1 --pretty='%h')) tag=$(shell echo $(branch) | grep -Eo 'feature/([A-Za-z]+-[0-9]*)' | grep -Eo '[A-Za-z]+-[0-9]*' || \
echo $(branch) | grep -Eo '(release|hotfix)/[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+' | grep -Eo '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+' || \
echo $(branch) | grep -Eo 'YASDEV-([[:digit:]]*)')
full: build push ## build the docker container completely full: build push
build: ## build the production dockerfile build: ## build the production dockerfile
docker build -t $(repo)/$(project):$(tag) \ @if [[ -n "$(tag)" ]]; then \
-t $(repo)/$(project):$(branch) \ echo "$(tag)" > docker_tag.txt; \
. docker build -t $(repo)/$(project):$(tag) .; \
if git describe --exact-match --tags $(shell git log -n1 --pretty='%h'); then \ else \
docker tag $(repo)/$(project):$(tag) $(repo)/$(project):$(version); \ echo "Nothing to build."; \
fi fi
push: ## push the production dockerfile push: ## push the production dockerfile
docker push $(repo)/$(project):$(tag) @if [[ -n "$(tag)" ]]; then \
docker push $(repo)/$(project):$(branch) docker push $(repo)/$(project):$(tag); \
if git describe --exact-match --tags $(shell git log -n1 --pretty='%h'); then \ else \
docker push $(repo)/$(project):$(version); \ echo "Nothing to push."; \
fi fi
display: ## display the tag/branch values for development testing
@echo "branch: $(branch)"
@echo "tag: $(tag)"

2
README.md
View File

@ -1,4 +1,4 @@
# BRAID v1.2.2 # BRAID v1.2.3
> Websocket server for the Measure platform > Websocket server for the Measure platform
[![Build Status](https://semaphoreci.com/api/v1/projects/7767f0f3-4da6-4c84-9167-4db5402a3262/2573412/badge.svg)](https://semaphoreci.com/yardstick/braid) [![Build Status](https://semaphoreci.com/api/v1/projects/7767f0f3-4da6-4c84-9167-4db5402a3262/2573412/badge.svg)](https://semaphoreci.com/yardstick/braid)

1
docker_tag.txt Normal file
View File

@ -0,0 +1 @@
1.2.3

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "braid", "name": "braid",
"version": "1.2.2", "version": "1.2.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
src/config/app.ts
View File

@ -1,5 +1,5 @@
module.exports = { module.exports = {
version : '1.2.2', version : '1.2.3',
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',