Nesting commands to fix container cleanup (#1542)

* Nesting commands to fix container cleanup * Adding UI test config change
ansible · Sep 23, 2024 · 8c4243f · 8c4243f
1 parent e902379
commit 8c4243f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -156,6 +156,9 @@ tasks:
   test-ui:
     desc: Run UI tests {{.XVFB}}
     aliases: [ui]
+    env:
+      MOCHA_GREP: Test One Click Trial feature
+      MOCHA_INVERT: true
     cmds:
       - yarn webpack-dev
       - "{{.VIRTUAL_ENV}}/bin/python3 --version"

diff --git a/packages/ansible-language-server/src/services/executionEnvironment.ts b/packages/ansible-language-server/src/services/executionEnvironment.ts
@@ -361,8 +361,8 @@ export class ExecutionEnvironment {
 
   private cleanUpContainer(containerName: string): void {
     const cleanUpCommands = [
-      `${this._container_engine} stop ${containerName}`,
-      `${this._container_engine} rm ${containerName}`,
+      `${this._container_engine} stop $(${this._container_engine} ps -q --filter "name=${containerName}")`,
+      `${this._container_engine} rm $(${this._container_engine} container ls -aq -f 'name=${containerName}')`,
     ];
 
     if (!this.doesContainerNameExist(containerName)) {