From 81ed8fc523b967d40c3b44aed48ef2024aedff59 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Sun, 14 Aug 2022 14:17:28 -0700 Subject: [PATCH] devops: gracefully handle stopping already-stopped container (#16528) --- browser_patches/docker/cli.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser_patches/docker/cli.sh b/browser_patches/docker/cli.sh index 5719d2c2c2..0356775250 100755 --- a/browser_patches/docker/cli.sh +++ b/browser_patches/docker/cli.sh @@ -86,7 +86,7 @@ elif [[ "$2" == "compile" ]]; then elif [[ "$2" == "enter" ]]; then docker run --rm ${DOCKER_ARGS} --init --name "${DOCKER_CONTAINER_NAME}" --platform "${DOCKER_PLATFORM}" -it "${DOCKER_IMAGE_NAME}" /bin/bash elif [[ "$2" == "kill" || "$2" == "stop" ]]; then - docker kill "${DOCKER_CONTAINER_NAME}" + docker kill "${DOCKER_CONTAINER_NAME}" || true # Wait for container to stop docker wait "${DOCKER_CONTAINER_NAME}" || true else