diff --git a/Jenkinsfile b/Jenkinsfile index 4ccc54b46..5d03be700 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,6 @@ pipeline { environment { NODE_ENV = "" FIREFOX_BIN = "/opt/firefox/firefox-bin" - DB_HOST = "${env.DOCKER_HOST_2}" } steps { nodejs('node-lts') { diff --git a/gulpfile.js b/gulpfile.js index 2ac31a86e..60d594b5b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,9 +23,6 @@ let containerId = 'salix-db'; let dataSources = require('./loopback/server/datasources.json'); let dbConf = dataSources.vn; -if (process.env.DB_HOST) - dbConf.host = process.env.DB_HOST; - let backSources = [ '!node_modules', 'loopback', @@ -423,9 +420,11 @@ async function docker() { containerId = result.stdout; if (argv['random']) { - let inspect = await execP(`docker inspect -f "{{json .NetworkSettings.Ports}}" ${containerId}`); - let ports = JSON.parse(inspect.stdout); - dbConf.port = ports['3306/tcp'][0]['HostPort']; + let inspect = await execP(`docker inspect -f "{{json .NetworkSettings}}" ${containerId}`); + let netSettings = JSON.parse(inspect.stdout); + + dbConf.host = netSettings.Gateway; + dbConf.port = netSettings.Ports['3306/tcp'][0]['HostPort']; } if (runChown) await dockerWait();