Merge pull request #3337 from dokku/fix-cid

Use correct container id variable for killing containers
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2018-12-17 17:26:09 -05:00
commit 7a81f89442
1 file changed
+2 -2
@@ -103,8 +103,8 @@ fn-scheduler-docker-local-retire-container() {
# to not send SIGKILL as the docs would indicate. If that fails, move # to not send SIGKILL as the docs would indicate. If that fails, move
# on to the next. # on to the next.
# shellcheck disable=SC2086 # shellcheck disable=SC2086
docker stop $DOCKER_STOP_TIME_ARG "$oldid" \ docker stop $DOCKER_STOP_TIME_ARG "$CID" \
|| docker kill "$oldid" \ || docker kill "$CID" \
|| dokku_log_warn "Unable to kill container ${CID}" || dokku_log_warn "Unable to kill container ${CID}"
if ! docker kill "$CID"; then if ! docker kill "$CID"; then