dokku/dokku-postgres
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: correct ID check

Browse Source 
It may be true in tests because we mock docker itself...
This commit is contained in:
Jose Diaz-Gonzalez
2019-03-09 15:24:20 -05:00
parent 52f95594c0
commit 195a96de65
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common-functions
View File

@@ -277,9 +277,12 @@ service_container_rm() {
declare desc="Stops a service and removes the running container" declare desc="Stops a service and removes the running container"
declare SERVICE="$1" declare SERVICE="$1"
local SERVICE_NAME="$(get_service_name "$SERVICE")" local SERVICE_NAME="$(get_service_name "$SERVICE")"
local ID
service_stop "$SERVICE" service_stop "$SERVICE"
if ! docker inspect "$SERVICE_NAME" -f '{{ .ID }}' > /dev/null 2>&1; then ID=$(docker inspect "$SERVICE_NAME" -f '{{ .ID }}' > /dev/null 2>&1 || true)
# this may be 'true' in tests...
if [[ -z "$ID" ]] || [[ "$ID" == "true" ]]; then
return 0 return 0
fi fi