verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 51 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 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8468eda05a - Show all commits

7
db/docker.js
View File

@ -42,9 +42,13 @@ module.exports = class Docker {
let runChown = process.platform != 'linux'; let runChown = process.platform != 'linux';
let network = '';
if (ci) network = '--network="jenkins"';
log('Starting container...'); log('Starting container...');
const container = await this.execP(` const container = await this.execP(`
docker run \ docker run \
${network} \
--env RUN_CHOWN=${runChown} \ --env RUN_CHOWN=${runChown} \
-d ${dockerArgs} salix-db -d ${dockerArgs} salix-db
`); `);
@ -52,9 +56,6 @@ module.exports = class Docker {
try { try {
if (this.isRandom) { if (this.isRandom) {
if (ci)
await this.execP(`docker network connect jenkins ${this.id}`);
let inspect = await this.execP(`docker inspect -f "{{json .NetworkSettings}}" ${this.id}`); let inspect = await this.execP(`docker inspect -f "{{json .NetworkSettings}}" ${this.id}`);
let netSettings = JSON.parse(inspect.stdout); let netSettings = JSON.parse(inspect.stdout);