verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Deploy fixes

This commit is contained in:
Juan Ferrer 2019-01-07 09:54:00 +01:00
parent 2c69e64939
commit 4bf80493fc
5 changed files with 2471 additions and 3687 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Jenkinsfile vendored
View File

@ -1,21 +1,6 @@
#!/usr/bin/env groovy #!/usr/bin/env groovy
switch (env.BRANCH_NAME) {
case 'master':
env.NODE_ENV = 'production'
break;
case 'test':
env.NODE_ENV = 'test'
break;
case 'dev':
env.NODE_ENV = 'development'
break;
}
node { node {
stage ('Print environment variables') {
echo "Build number: ${env.BUILD_NUMBER}, Node environment: ${env.NODE_ENV}"
}
stage ('Checkout') { stage ('Checkout') {
checkout scm checkout scm
} }
@ -32,12 +17,20 @@ node {
} }
stage ('Docker deployment') { stage ('Docker deployment') {
withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
env.COMPOSE_PROJECT_NAME = 'salix'
env.DOCKER_TLS_VERIFY = 1
env.TAG = env.NODE_ENV
if (env.BRANCH_NAME != 'master') { if (env.BRANCH_NAME != 'master') {
env.COMPOSE_PROJECT_NAME = "${env.BRANCH_NAME}-salix" env.COMPOSE_PROJECT_NAME = "${env.BRANCH_NAME}-${env.JOB_NAME}"
}
switch (env.BRANCH_NAME) {
case 'master':
env.NODE_ENV = 'production'
break;
case 'test':
env.NODE_ENV = 'test'
break;
case 'dev':
env.NODE_ENV = 'development'
break;
} }
switch (env.BRANCH_NAME) { switch (env.BRANCH_NAME) {
@ -49,6 +42,10 @@ node {
break; break;
} }
env.COMPOSE_PROJECT_NAME = env.JOB_NAME
env.DOCKER_TLS_VERIFY = 1
env.TAG = env.NODE_ENV
env.DOCKER_HOST = 'tcp://vch1.verdnatura.es:2376'; env.DOCKER_HOST = 'tcp://vch1.verdnatura.es:2376';
sh "docker-compose up --build -d" sh "docker-compose up --build -d"
@ -57,3 +54,11 @@ node {
} }
} }
} }
post {
always {
mail to: 'salix@verdnatura.es', subject: 'Pipeline', "Pipeline success: ${env.JOB_NAME}"
}
failure {
mail to: 'salix@verdnatura.es', subject: 'Pipeline', "Pipeline failed: ${env.JOB_NAME}"
}
}

4918
front/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
front/package.json
View File

@ -8,18 +8,18 @@
"url": "https://git.verdnatura.es/salix" "url": "https://git.verdnatura.es/salix"
}, },
"dependencies": { "dependencies": {
"@babel/polyfill": "^7.2.3", "@babel/polyfill": "^7.2.5",
"@uirouter/angularjs": "^1.0.20", "@uirouter/angularjs": "^1.0.20",
"angular": "^1.7.4", "angular": "^1.7.5",
"angular-cookies": "^1.7.4", "angular-cookies": "^1.7.5",
"angular-translate": "^2.18.1", "angular-translate": "^2.18.1",
"angular-translate-loader-partial": "^2.18.1", "angular-translate-loader-partial": "^2.18.1",
"flatpickr": "^4.5.2", "flatpickr": "^4.5.2",
"fs-extra": "^5.0.0", "fs-extra": "^5.0.0",
"js-yaml": "^3.12.0", "js-yaml": "^3.12.1",
"material-design-lite": "^1.3.0", "material-design-lite": "^1.3.0",
"mg-crud": "^1.1.2", "mg-crud": "^1.1.2",
"npm": "^5.10.0", "npm": "^6.5.0",
"oclazyload": "^0.6.3", "oclazyload": "^0.6.3",
"require-yaml": "0.0.1", "require-yaml": "0.0.1",
"validator": "^6.3.0" "validator": "^6.3.0"

1159
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@ -5,7 +5,7 @@
"description": "Salix application", "description": "Salix application",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"compression": "^1.0.3", "compression": "^1.7.3",
"cookie-parser": "^1.4.3", "cookie-parser": "^1.4.3",
"cors": "^2.8.5", "cors": "^2.8.5",
"fs-extra": "^5.0.0", "fs-extra": "^5.0.0",
@ -16,28 +16,28 @@
"loopback-component-explorer": "^6.3.1", "loopback-component-explorer": "^6.3.1",
"loopback-connector-mysql": "^5.3.1", "loopback-connector-mysql": "^5.3.1",
"loopback-connector-remote": "^3.4.0", "loopback-connector-remote": "^3.4.0",
"loopback-context": "^3.3.0", "loopback-context": "^3.4.0",
"md5": "^2.2.1", "md5": "^2.2.1",
"object-diff": "0.0.4", "object-diff": "0.0.4",
"object.pick": "^1.3.0", "object.pick": "^1.3.0",
"request": "^2.83.0", "request": "^2.88.0",
"require-yaml": "0.0.1", "require-yaml": "0.0.1",
"serve-favicon": "^2.0.1", "serve-favicon": "^2.5.0",
"strong-error-handler": "^2.1.0", "strong-error-handler": "^2.3.2",
"uuid": "^3.1.0", "uuid": "^3.3.2",
"vn-loopback": "file:./loopback" "vn-loopback": "file:./loopback"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.2.2", "@babel/core": "^7.2.2",
"@babel/polyfill": "^7.2.3", "@babel/polyfill": "^7.2.5",
"@babel/preset-env": "^7.2.0", "@babel/preset-env": "^7.2.0",
"@babel/register": "^7.0.0", "@babel/register": "^7.0.0",
"angular-mocks": "^1.7.4", "angular-mocks": "^1.7.4",
"assets-webpack-plugin": "^3.9.7", "assets-webpack-plugin": "^3.9.7",
"babel-loader": "^8.0.4", "babel-loader": "^8.0.5",
"css-loader": "^0.25.0", "css-loader": "^0.25.0",
"del": "^2.2.2", "del": "^2.2.2",
"eslint": "^5.7.0", "eslint": "^5.12.0",
"eslint-config-google": "^0.11.0", "eslint-config-google": "^0.11.0",
"eslint-plugin-jasmine": "^2.10.1", "eslint-plugin-jasmine": "^2.10.1",
"fancy-log": "^1.3.2", "fancy-log": "^1.3.2",
@ -76,10 +76,10 @@
"run-sequence": "^2.2.1", "run-sequence": "^2.2.1",
"sass-loader": "^6.0.7", "sass-loader": "^6.0.7",
"style-loader": "^0.20.3", "style-loader": "^0.20.3",
"webpack": "^4.27.1", "webpack": "^4.28.3",
"webpack-cli": "^3.1.2", "webpack-cli": "^3.2.0",
"webpack-dev-server": "^3.1.10", "webpack-dev-server": "^3.1.14",
"webpack-merge": "^4.1.5", "webpack-merge": "^4.2.1",
"yaml-loader": "^0.5.0" "yaml-loader": "^0.5.0"
}, },
"repository": { "repository": {