Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
This commit is contained in:
commit
bf9f6bb1f6
|
@ -40,7 +40,7 @@ module.exports = class Docker {
|
|||
let runChown = process.platform != 'linux';
|
||||
|
||||
const container = await this.execP(`docker run --env RUN_CHOWN=${runChown} -d ${dockerArgs} salix-db`);
|
||||
this.id = container.stdout;
|
||||
this.id = container.stdout.trim();
|
||||
|
||||
try {
|
||||
if (this.isRandom) {
|
||||
|
@ -177,7 +177,7 @@ module.exports = class Docker {
|
|||
}
|
||||
|
||||
rm() {
|
||||
return this.execP(`docker rm -fv ${this.id}`);
|
||||
return this.execP(`docker stop ${this.id} && docker rm -v ${this.id}`);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue