jdb/personal-measure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow targeting different environments with deply. Add version string on the web App component.

Browse Source
This commit is contained in:
Jonathan Bernard 2019-05-19 01:28:02 -05:00
parent 4bc8c00c49
commit 30ced3ecfd
7 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -1,4 +1,5 @@
VERSION:=$(shell git describe --always) VERSION:=$(shell git describe --always)
TARGET_ENV=prod
build: dist/personal-measure-api.tar.gz dist/personal-measure-web.tar.gz build: dist/personal-measure-api.tar.gz dist/personal-measure-web.tar.gz
@ -17,13 +18,15 @@ dist/personal-measure-web.tar.gz:
deploy-api: dist/personal-measure-api.tar.gz deploy-api: dist/personal-measure-api.tar.gz
mkdir -p temp-deploy/personal-measure-api-${VERSION} mkdir -p temp-deploy/personal-measure-api-${VERSION}
tar xzf dist/personal-measure-api-${VERSION}.tar.gz -C temp-deploy/personal-measure-api-${VERSION} tar xzf dist/personal-measure-api-${VERSION}.tar.gz -C temp-deploy/personal-measure-api-${VERSION}
scp temp-deploy/personal-measure-api-${VERSION}/personal_measure_api pmapi@pmapi.jdbernard.com:/home/pmapi/personal_measure_api -ssh pmapi@pmapi.jdb-labs.com "sudo systemctl stop personal_measure_api.$(TARGET_ENV).service"
scp temp-deploy/personal-measure-api-${VERSION}/personal_measure_api pmapi@pmapi.jdb-labs.com:/home/pmapi/$(TARGET_ENV)/personal_measure_api
ssh pmapi@pmapi.jdb-labs.com "sudo systemctl start personal_measure_api.$(TARGET_ENV).service"
rm -r temp-deploy rm -r temp-deploy
deploy-web: dist/personal-measure-web.tar.gz deploy-web: dist/personal-measure-web.tar.gz
mkdir -p temp-deploy/personal-measure-web-${VERSION} mkdir -p temp-deploy/personal-measure-web-${VERSION}
tar xzf dist/personal-measure-web-${VERSION}.tar.gz -C temp-deploy/personal-measure-web-${VERSION} tar xzf dist/personal-measure-web-${VERSION}.tar.gz -C temp-deploy/personal-measure-web-${VERSION}
aws s3 sync temp-deploy/personal-measure-web-${VERSION} s3://personal-measure.jdbernard.com aws s3 sync temp-deploy/personal-measure-web-${VERSION} s3://pm.jdb-labs.com/$(TARGET_ENV)/webroot
rm -r temp-deploy rm -r temp-deploy
deploy: deploy-api deploy-web deploy: deploy-api deploy-web

2
web/.env.production
View File

@ -1,3 +1,3 @@
VUE_APP_PM_API_BASE=https://personal-measure.jdb-labs.com/api VUE_APP_PM_API_BASE=https://pm.jdb-labs.com/api
VUE_APP_LOG_LEVEL=INFO VUE_APP_LOG_LEVEL=INFO
VUE_APP_API_LOG_LEVEL=ERROR VUE_APP_API_LOG_LEVEL=ERROR

1
web/Makefile
View File

@ -1,4 +1,3 @@
API_ADDR='localhost:8080'
API_LOG_LEVEL='WARN' API_LOG_LEVEL='WARN'
LOG_LEVEL='TRACE' LOG_LEVEL='TRACE'

2
web/package.json
View File

@ -4,7 +4,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "build": "vue-cli-service build --mode production",
"build-dev": "vue-cli-service build --mode development", "build-dev": "vue-cli-service build --mode development",
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit" "test:unit": "vue-cli-service test:unit"

1
web/src/app.ts
View File

@ -13,6 +13,7 @@ const logger = logService.getLogger('/app');
}) })
export default class App extends Vue { export default class App extends Vue {
public version = process.env.PM_VERSION;
private apiLogAppender!: ApiLogAppender; private apiLogAppender!: ApiLogAppender;
private consoleLogAppender!: ConsoleLogAppender; private consoleLogAppender!: ConsoleLogAppender;

2
web/src/components/measure-details/simple-details.ts
View File

@ -12,7 +12,7 @@ export class SimpleDetails extends Vue {
@Prop() private measure!: Measure<MeasureConfig>; @Prop() private measure!: Measure<MeasureConfig>;
@Prop() private measurements!: Array<Measurement<MeasurementMeta>>; @Prop() private measurements!: Array<Measurement<MeasurementMeta>>;
private newMeasurement; // private newMeasurement;
private moment = moment; private moment = moment;
private chartOptions = { private chartOptions = {
noData: { text: 'no data', noData: { text: 'no data',

13
web/vue.config.js
View File

@ -1,3 +1,10 @@
const merge = require('deepmerge');
const VERSION = {
'process.env': {
PM_VERSION: JSON.stringify(require('./package.json').version)
}
};
module.exports = { module.exports = {
devServer: { devServer: {
proxy: { proxy: {
@ -17,5 +24,11 @@ module.exports = {
analyzerMode: 'static', analyzerMode: 'static',
openAnalyzer: false openAnalyzer: false
} }
},
chainWebpack: config => {
config
.plugin('define')
.tap(args => merge(args, [VERSION]))
} }
}; };