update

Author: kriscfoster

docker_compose_test.patch

@@ -0,0 +1,37 @@
+diff --git a/docker_compose_test/docker_compose_test.sh b/docker_compose_test/docker_compose_test.sh
+index 2e6110f..292c216 100755
+--- a/docker_compose_test/docker_compose_test.sh
++++ b/docker_compose_test/docker_compose_test.sh
+@@ -53,12 +53,29 @@ if [ $? -eq 0 ]; then
+     docker_compose_bin="docker-compose"
+ fi
+ 
+-# bring up compose file & get exit status-code from the integration test container
+-docker_compose_up_cmd="$docker_compose_bin -f $ABSOLUTE_COMPOSE_FILE_PATH up --exit-code-from $DOCKER_COMPOSE_TEST_CONTAINER $EXTRA_DOCKER_COMPOSE_UP_ARGS"
++cleanup() {
++    echo "Cleaning up docker-compose resources..."
++    docker_compose_down_cmd="$docker_compose_bin -f $ABSOLUTE_COMPOSE_FILE_PATH down --volumes --remove-orphans"
++    echo "running: $docker_compose_down_cmd"
++    echo "$docker_compose_down_cmd" | bash
++}
++
++# Ensure cleanup runs on EXIT (covers normal exit, errors, and signals).
++# SIGTERM: sent by Bazel on test timeout or cancellation.
++# SIGINT: sent on Ctrl+C.
++trap cleanup EXIT
++
++# bring up compose file & get exit status-code from the integration test container.
++docker_compose_up_cmd="$docker_compose_bin -f $ABSOLUTE_COMPOSE_FILE_PATH up --exit-code-from $DOCKER_COMPOSE_TEST_CONTAINER $EXTRA_DOCKER_COMPOSE_UP_ARGS"
+ echo "running: $docker_compose_up_cmd"
+ echo "$docker_compose_up_cmd" | bash
+ result=$?
+ 
+-$docker_compose_bin -f $ABSOLUTE_COMPOSE_FILE_PATH down
++# Figure out the exit code of the test container incase it never actually started.
++EXIT_CODE=$(docker inspect $(docker compose -f $ABSOLUTE_COMPOSE_FILE_PATH ps -qa $DOCKER_COMPOSE_TEST_CONTAINER) --format='{{.State.ExitCode}}' 2>/dev/null)
++if [ "$EXIT_CODE" != "0" ] || [ -z "$EXIT_CODE" ]; then
++  echo "Error: $DOCKER_COMPOSE_TEST_CONTAINER container failed or never started!"
++  exit 1
++fi
+ 
+ exit $result