Revert "Merge branch 'test' into dev"

This reverts commit b6091775e5, reversing
changes made to 42f1e1ec6f.

.env.json

@@ -1,6 +0,0 @@
-{
-    "salixHost": "localhost",
-    "salixPort": 3306,
-    "salixUser": "root",
-    "salixPassword": ""
-}

Jenkinsfile

@@ -6,16 +6,10 @@ def branchTest = "test";
 
 env.BRANCH_NAME = branchName;
 env.TAG = "${env.BUILD_NUMBER}";
-env.salixUser="${env.salixUser}";
-env.salixPassword="${env.salixPassword}";
-env.salixHost = "${env.productionSalixHost}";
-env.salixPort = "${env.productionSalixPort}";
 
 switch (branchName){
     case branchTest: 
         env.NODE_ENV = "test";
-        env.salixHost = "${env.testSalixHost}";
-        env.salixPort = "${env.testSalixPort}";
         break;
     case branchProduction:
         env.DOCKER_HOST = "tcp://172.16.255.29:2375";
@@ -26,7 +20,7 @@ switch (branchName){
 node 
 {
     stage ('Print environment variables'){
-        echo "Branch ${branchName}, Build ${env.TAG}, salixHost ${env.salixHost},  NODE_ENV ${env.NODE_ENV} en docker Host ${env.DOCKER_HOST}"
+        echo "Branch ${branchName}, Build ${env.TAG}, NODE_ENV ${env.NODE_ENV} en docker Host ${env.DOCKER_HOST}"
     }
     stage ('Checkout') {
         checkout scm

client/core/src/lib/crud.js

@@ -32,7 +32,7 @@ function put(mgPut) {
 }
 ngModule.factory('vnPut', put);
 
-patch.$inject = ['mgPatch'];
+put.$inject = ['mgPatch'];
 function patch(mgPatch) {
     return Object.assign({}, mgPatch, {
         success: 'vnSuccessFactoryCreate'

gulpfile.js

@@ -1,7 +1,6 @@
 require('require-yaml');
 const gulp = require('gulp');
 const runSequence = require('run-sequence');
-const gulpEnv = require('gulp-env');
 const fs = require('fs-extra');
 const exec = require('child_process').exec;
 const PluginError = require('plugin-error');
@@ -28,7 +27,6 @@ let devServerPort = wpConfig.devServerPort;
 let nginxDir = `${servicesDir}/nginx`;
 let proxyConf = require(`${nginxDir}/config.yml`);
 let proxyEnvFile = `${nginxDir}/config.${env}.yml`;
-let environmentFile = './.env.json';
 
 if (fs.existsSync(proxyEnvFile))
     Object.assign(proxyConf, require(proxyEnvFile));
@@ -39,24 +37,18 @@ let defaultPort = proxyConf.defaultPort;
 // Development
 
 gulp.task('default', () => {
-    return gulp.start('environment', 'services', 'client');
+    return gulp.start('services', 'client');
 });
 
 gulp.task('client', ['build-clean'], async () => {
     await runSequenceP(['routes', 'locales'], 'watch', 'webpack-dev-server');
 });
 
-gulp.task('environment', () => {
-    gulpEnv({
-        file: environmentFile,
-    });
-});
-
 /**
  * Starts all backend services, including the nginx proxy and the database.
  */
 gulp.task('services', async () => {
-    await runSequenceP('environment', 'docker-start', 'services-only', 'nginx');
+    await runSequenceP('docker-start', 'services-only', 'nginx');
 });
 
 /**
@@ -152,12 +144,7 @@ gulp.task('docker-compose', async () => {
         //    dockerFile = 'Dockerfile';
 
         composeYml.services[service.name] = {
-            environment: ['NODE_ENV=${NODE_ENV}',
-                'salixHost=${salixHost}',
-                'salixUser=${salixUser}',
-                'salixPassword=${salixPassword}',
-                'salixPort=${salixPort}'
-                ],
+            environment: ['NODE_ENV=${NODE_ENV}'],
             container_name: `\${BRANCH_NAME}-${service.name}`,
             image: `${service.name}:\${TAG}`,
             build: {
@@ -404,7 +391,7 @@ gulp.task('watch', function() {
  * Rebuilds the docker and it's image, if these already exist, destroys and
  * rebuilds them.
  */
-gulp.task('docker-rebuild', ['environment'], async () => {
+gulp.task('docker-rebuild', async () => {
     try {
         await execP('docker rm -f dblocal');
     } catch (e) {}
@@ -447,10 +434,10 @@ gulp.task('docker-run', async () => {
     try {
         await execP('docker image inspect -f "{{json .Id}}" dblocal');
     } catch (err) {
-        await execP(`docker build -t dblocal:latest --build-arg rootPassword=${process.env.salixPassword} ./services/db`);
+        await execP('docker build -t dblocal:latest ./services/db');
     }
 
-    await execP(`docker run -d --name dblocal -p ${process.env.salixPort}:${process.env.salixPort} dblocal`);
+    await execP('docker run -d --name dblocal -p 3306:3306 dblocal');
     await runSequenceP('docker-wait');
 });
 
@@ -482,10 +469,8 @@ gulp.task('docker-wait', callback => {
             return callback(new Error('Docker exited, please see the docker logs for more info'));
 
         let conn = mysql.createConnection({
-            host: process.env.salixHost,
-            port: process.env.salixPort,
-            user: process.env.salixUser,
-            password: process.env.salixPassword
+            host: 'localhost',
+            user: 'root'
         });
         conn.on('error', () => {});
         conn.connect(err => {

package.json

@@ -44,7 +44,6 @@
     "file-loader": "^1.1.6",
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.0",
-    "gulp-env": "^0.4.0",
     "gulp-extend": "^0.2.0",
     "gulp-install": "^1.1.0",
     "gulp-jasmine": "^3.0.0",

services/db/03-changes.sh

@@ -2,5 +2,5 @@
 
 for file in changes/*/*.sql; do
     echo "Importing $file"
-    mysql -u root -p$salixPassword < $file
+    mysql -u root < $file
 done

services/db/Dockerfile

@@ -1,8 +1,6 @@
 FROM mysql:5.6.37
 
-ARG rootPassword
-ENV salixPassword $rootPassword
-ENV MYSQL_ROOT_PASSWORD $salixPassword
+ENV MYSQL_ALLOW_EMPTY_PASSWORD yes
 ENV TZ GMT-1
 
 WORKDIR /docker-entrypoint-initdb.d

services/loopback/server/.env.json

@@ -1,6 +0,0 @@
-{
-    "salixHost": "localhost",
-    "salixPort": 3306,
-    "salixUser": "root",
-    "salixPassword": ""
-}

services/loopback/server/Jenkinsfile

@@ -1,60 +0,0 @@
-#!/usr/bin/env groovy
-
-def branchName = "${env.BRANCH_NAME}";
-def branchProduction = "master"
-def branchTest = "test";
-
-env.BRANCH_NAME = branchName;
-env.TAG = "${env.BUILD_NUMBER}";
-env.salixUser="${env.salixUser}";
-env.salixPassword="${env.salixPassword}";
-env.salixHost = "${env.productionSalixHost}";
-env.salixPort = "${env.productionSalixPort}";
-
-switch (branchName){
-    case branchTest: 
-        env.NODE_ENV = "test";
-        env.salixHost = "${env.testSalixHost}";
-        env.salixPort = "${env.testSalixPort}";
-        break;
-    case branchProduction:
-        env.DOCKER_HOST = "tcp://172.16.255.29:2375";
-        env.NODE_ENV = "production"
-        break;
-}
-
-node 
-{
-    stage ('Print environment variables'){
-        echo "Branch ${branchName}, Build ${env.TAG}, salixHost ${env.salixHost}, NODE_ENV ${env.NODE_ENV} en docker Host ${env.DOCKER_HOST}"
-    }
-    stage ('Checkout') {
-        checkout scm
-    }
-
-    stage ('install modules'){
-        sh "npm install"
-    }
-    
-    stage ('build Project'){
-        sh "gulp build"
-    }
-
-    stage ("docker")
-    {
-        stage ("install modules loopback service")
-        {
-            sh "cd ./services/loopback && npm install"
-        }
-        
-        stage ("Stopping/Removing Docker")
-        {
-             sh "docker-compose down --rmi 'all'" 
-        }
-
-        stage ("Generar dockers")
-        {
-            sh "docker-compose up -d --build"
-        }  
-    }
-}

services/loopback/server/datasources.json

@@ -1,41 +1,37 @@
 {
   "db": {
-    "name": "db",
     "connector": "memory"
   },
   "vn": {
-    "name": "mysql",
     "connector": "mysql",
     "database": "vn",
     "debug": false,
-    "host": "${salixHost}",
-    "port": "${salixPort}",
-    "username": "${salixUser}",
-    "password": "${salixPassword}",
+    "host": "localhost",
+    "port": 3306,
+    "username": "root",
+    "password": "",
     "connectTimeout": 20000,
     "acquireTimeout": 20000
   },
   "salix": {
-    "name": "mysql",
     "connector": "mysql",
     "database": "salix",
     "debug": false,
-    "host": "${salixHost}",
-    "port": "${salixPort}",
-    "username": "${salixUser}",
-    "password": "${salixPassword}",
+    "host": "localhost",
+    "port": 3306,
+    "username": "root",
+    "password": "",
     "connectTimeout": 20000,
     "acquireTimeout": 20000
   },
   "account": {
-    "name": "mysql",
     "connector": "mysql",
     "database": "account",
     "debug": false,
-    "host": "${salixHost}",
-    "port": "${salixPort}",
-    "username": "${salixUser}",
-    "password": "${salixPassword}",
+    "host": "localhost",
+    "port": 3306,
+    "username": "root",
+    "password": "",
     "connectTimeout": 20000,
     "acquireTimeout": 20000
   },
@@ -43,10 +39,10 @@
     "connector": "mysql",
     "database": "edi",
     "debug": false,
-    "host": "${salixHost}",
-    "port": "${salixPort}",
-    "username": "${salixUser}",
-    "password": "${salixPassword}",
+    "host": "localhost",
+    "port": 3306,
+    "username": "root",
+    "password": "",
     "connectTimeout": 20000,
     "acquireTimeout": 20000
   }

services/nginx/logs/error.log

@@ -1,4 +0,0 @@
-2018/03/02 09:31:59 [notice] 7044#10044: signal process started
-2018/03/02 09:31:59 [notice] 3892#15188: signal process started
-2018/03/02 09:39:40 [notice] 8636#14980: signal process started
-2018/03/02 12:40:36 [notice] 8340#13172: signal process started