Merge pull request #3337 from dokku/fix-cid

Use correct container id variable for killing containers
This commit is contained in:
Jose Diaz-Gonzalez
2018-12-17 17:26:09 -05:00
committed by GitHub

View File

@@ -103,8 +103,8 @@ fn-scheduler-docker-local-retire-container() {
# to not send SIGKILL as the docs would indicate. If that fails, move
# on to the next.
# shellcheck disable=SC2086
docker stop $DOCKER_STOP_TIME_ARG "$oldid" \
|| docker kill "$oldid" \
docker stop $DOCKER_STOP_TIME_ARG "$CID" \
|| docker kill "$CID" \
|| dokku_log_warn "Unable to kill container ${CID}"
if ! docker kill "$CID"; then