verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

4592-jenkins_tests #1075

Merged
joan merged 27 commits from 4592-jenkins_tests into dev 2022-10-05 12:40:29 +00:00
Conversation 0 Commits 27 Files Changed 5 +4 -9
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1cafbdab6e - Show all commits

13
db/docker.js
View File

@ -57,17 +57,12 @@ module.exports = class Docker {
let netSettings = JSON.parse(inspect.stdout);
if (ci) {
console.log('Running on CI...');
// this.dbConf.host = netSettings.Gateway;
this.dbConf.host = netSettings.Networks.jenkins.IPAddress;
}
this.dbConf.port = 3306;
// console.log(netSettings);
// this.dbConf.port = netSettings.Ports['3306/tcp'][0]['HostPort'];
this.dbConf.port = 3306;
console.log('Host: ', this.dbConf.host);
console.log('Port: ', this.dbConf.port);
await this.execP(`docker network connect jenkins ${this.id}`);
} else
this.dbConf.port = netSettings.Ports['3306/tcp'][0]['HostPort'];
}
await this.wait();