From ee669c68e2265afa81f8f9600030acec365b587f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 27 Aug 2017 18:55:23 -0400 Subject: [PATCH] fix: skip removing the ambassador container when it isn't running. Closes dokku/dokku-mongo#90 --- common-functions | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/common-functions b/common-functions index ad0cb04..d3adc7f 100755 --- a/common-functions +++ b/common-functions @@ -412,8 +412,17 @@ service_port_pause() { [[ ! -f "$PORT_FILE" ]] && return 0 fi - docker stop "$EXPOSED_NAME" > /dev/null - docker rm "$EXPOSED_NAME" > /dev/null + local CONTAINER_NAME=$(docker ps -f name=^/${EXPOSED_NAME}$ --format "{{.Names}}") + if [[ -z "$CONTAINER_NAME" ]]; then + if [[ "$LOG_FAIL" == "true" ]]; then + dokku_log_info1 "Service $SERVICE unexposed" + fi + + return + fi + + docker stop "$EXPOSED_NAME" > /dev/null 2>&1 || true + docker rm "$EXPOSED_NAME" > /dev/null 2>&1 || true if [[ "$LOG_FAIL" == "true" ]]; then dokku_log_info1 "Service $SERVICE unexposed" fi