Stop all containers without using the name

linz · May 5, 2024 · 28a4306 · 28a4306
1 parent c188f2b
commit 28a4306
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -189,7 +189,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    needs: [build, screenshot]
+    needs: [build]
     runs-on: ubuntu-latest
     env:
       DOCKER_AWS_ENV: -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e AWS_REGION -e AWS_DEFAULT_REGION
@@ -216,7 +216,7 @@ jobs:
         run: ./scripts/bmc.sh --test ./node_modules/@basemaps/smoke/build/
 
       - name: (Smoke) Stop Server
-        run: docker stop bmc
+        run: docker stop $(docker ps -a -q)
 
   screenshot:
     permissions:
@@ -257,8 +257,8 @@ jobs:
           snapshot-path: .artifacts/visual-snapshots
 
       - name: (Screenshot) Stop Server
-        run: docker stop bmc
-
+        run: docker stop $(docker ps -a -q)
+        
   visual-diff:
     permissions:
       id-token: write

diff --git a/scripts/bmc.sh b/scripts/bmc.sh
@@ -3,7 +3,6 @@
 # Run the basemaps/cli as a docker container with all the extra environment vars and args passed in
 docker run \
   --entrypoint node \
-  --name bmc \
   -v ${PWD}:${PWD} \
   -p 5000:5000 \
   -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e AWS_REGION -e AWS_DEFAULT_REGION -e BASEMAPS_HOST \