diff --git a/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap b/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap index 3d18b2f2ae495b600f92147962b18e2a51457e33..f1cae80b858b135498679fe60140ae3a97006e75 100644 --- a/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/bundler/__snapshots__/artifacts.spec.ts.snap @@ -20,7 +20,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_ruby -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_ruby -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -65,7 +65,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_ruby -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_ruby -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -110,7 +110,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_ruby -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_ruby -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap b/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap index 4a77ff03236e3c512cd6a9f9802874f9d6dc3b01..687c058818d9a3235d68db7237f5afe134837d0e 100644 --- a/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/cargo/__snapshots__/artifacts.spec.ts.snap @@ -64,7 +64,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_rust -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_rust -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap b/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap index 971ae28a5407d14057baf610cce6e43dc4c7f21f..eb6874fe87253293eaf101e21d19f0b2da55d3d7 100644 --- a/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/cocoapods/__snapshots__/artifacts.spec.ts.snap @@ -16,7 +16,7 @@ exports[`.updateArtifacts() catches write error 2`] = `Array []`; exports[`.updateArtifacts() dynamically selects Docker image tag 1`] = ` Array [ Object { - "cmd": "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -28,7 +28,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -56,7 +56,7 @@ Array [ exports[`.updateArtifacts() falls back to the \`latest\` Docker image tag 1`] = ` Array [ Object { - "cmd": "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -68,7 +68,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -154,7 +154,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -176,7 +176,7 @@ Array [ exports[`.updateArtifacts() returns updated Podfile 2`] = ` Array [ Object { - "cmd": "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -188,7 +188,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_cocoapods -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap b/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap index a306cd96aff1946aaab08114b94d8069e883c11c..fe23b9deeac7d8c89f33f15da67f76d5cdb1e6f0 100644 --- a/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap @@ -100,7 +100,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_composer -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_composer -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap b/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap index 89721ed0f8b587b6ed8741bb645e521ccb82cac4..6def232ae65c7e0c8cc989e17ff312c5f86e294e 100644 --- a/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/gomod/__snapshots__/artifacts.spec.ts.snap @@ -76,7 +76,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -114,7 +114,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -141,7 +141,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -179,7 +179,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_go -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_go -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/manager/gradle/__snapshots__/index.spec.ts.snap b/lib/manager/gradle/__snapshots__/index.spec.ts.snap index 5366302df9bf25b0f44d8c4cb16324dd29379093..906a110e139826404f0725aabe2c89ded8133cbb 100644 --- a/lib/manager/gradle/__snapshots__/index.spec.ts.snap +++ b/lib/manager/gradle/__snapshots__/index.spec.ts.snap @@ -508,7 +508,7 @@ Array [ exports[`manager/gradle extractPackageFile should use docker even if gradlew is available 1`] = ` Array [ Object { - "cmd": "docker ps --filter name=renovate_gradle -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_gradle -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, @@ -542,7 +542,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_gradle -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_gradle -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap b/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap index 2f89d2e84e33dbe599e5330d8592ade0ec474f45..69c24bd4bcff78fe76fc13810d1f73a11807fc37 100644 --- a/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/pipenv/__snapshots__/artifacts.spec.ts.snap @@ -66,7 +66,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_pipenv -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_pipenv -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap b/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap index 74e5f3061cec6c76385a92c3615e0f385e213494..1dbbe193b95cc8c2e48680c2d8e99523c238f103 100644 --- a/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap +++ b/lib/manager/poetry/__snapshots__/artifacts.spec.ts.snap @@ -65,7 +65,7 @@ Array [ }, }, Object { - "cmd": "docker ps --filter name=renovate_poetry -aq | xargs ---no-run-if-empty docker rm -f", + "cmd": "docker ps --filter name=renovate_poetry -aq | xargs --no-run-if-empty docker rm -f", "options": Object { "encoding": "utf-8", }, diff --git a/lib/util/exec/__snapshots__/exec.spec.ts.snap b/lib/util/exec/__snapshots__/exec.spec.ts.snap index 032af4ade802672a90c94e17953cc9a651de51a1..139bf9040e6ed2239482d7b95a2745dc741760d5 100644 --- a/lib/util/exec/__snapshots__/exec.spec.ts.snap +++ b/lib/util/exec/__snapshots__/exec.spec.ts.snap @@ -4,18 +4,18 @@ exports[`Child process execution wrapper Supports image prefetch 1`] = ` Array [ "echo hello", "echo hello", - "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f", + "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f", "docker pull example/image", - "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f", + "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f", "docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"", - "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f", + "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f", "docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"", "echo hello", "echo hello", - "docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f", - "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f", + "docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f", + "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f", "docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"", - "docker ps --filter name=example_image -aq | xargs ---no-run-if-empty docker rm -f", + "docker ps --filter name=example_image -aq | xargs --no-run-if-empty docker rm -f", "docker run --rm --name=example_image --label=renovate_child example/image bash -l -c \\"echo hello\\"", ] `; diff --git a/lib/util/exec/docker/index.ts b/lib/util/exec/docker/index.ts index 6f436746eeaacaa47a27a386b286dcc6e7d307a1..ddbca758b7b4284e091f0d6309b548f5e9c90b15 100644 --- a/lib/util/exec/docker/index.ts +++ b/lib/util/exec/docker/index.ts @@ -136,7 +136,7 @@ export async function removeDockerContainer(image): Promise<void> { export async function removeDanglingContainers(): Promise<void> { try { const res = await rawExec( - `docker ps --filter label=renovate_child -aq | xargs ---no-run-if-empty docker rm -f`, + `docker ps --filter label=renovate_child -aq | xargs --no-run-if-empty docker rm -f`, { encoding: 'utf-8' } ); if (res?.stdout?.trim().length) { diff --git a/lib/util/exec/exec.spec.ts b/lib/util/exec/exec.spec.ts index ccc708314aec86d93fba2e85cab35af9dad53dfe..f7c35b69abaa5a506388622b71f8800fc0a75ff2 100644 --- a/lib/util/exec/exec.spec.ts +++ b/lib/util/exec/exec.spec.ts @@ -72,7 +72,7 @@ describe(`Child process execution wrapper`, () => { const docker = { image }; const processEnv = envMock.full; const dockerPullCmd = `docker pull ${image}`; - const dockerRemoveCmd = `docker ps --filter name=${name} -aq | xargs ---no-run-if-empty docker rm -f`; + const dockerRemoveCmd = `docker ps --filter name=${name} -aq | xargs --no-run-if-empty docker rm -f`; const dockerPullOpts = { encoding }; const dockerRemoveOpts = dockerPullOpts;