ci: remove docker down

deephaven · Mar 13, 2024 · 46ab2e0 · 46ab2e0
1 parent 1703b2e
commit 46ab2e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -31,6 +31,10 @@ jobs:
           path: playwright-report/
           retention-days: 90
 
+      - name: Dump server logs
+        if: failure()
+        run: docker logs deephaven-plugins > /tmp/server-log.txt
+
       - name: Upload server logs
         if: failure()
         uses: actions/upload-artifact@v4

diff --git a/tools/run_docker.sh b/tools/run_docker.sh
@@ -6,12 +6,13 @@ pushd "$(dirname "$0")"
 # Start the containers
 if [[ -z "${CI}" ]]; then
   docker compose run --service-ports --rm --build "$@"
+  exit_code=$?
+  docker compose down
 else
   docker compose run --service-ports --rm --build -e CI=true "$@"
+  exit_code=$?
+  docker compose stop deephaven-plugins
 fi
-exit_code=$?
-docker logs deephaven-plugins > /tmp/server-log.txt 2>&1
-docker compose down
 
 # Reset pwd
 popd