github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix: Use correct container id variable for killing containers

Browse Source 
The first pass at stop/kill would fail as the variable was incorrect.
This commit is contained in:
Jose Diaz-Gonzalez
2018-12-17 17:20:34 -05:00
parent 4f1cd2d30c
commit ba157867c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/scheduler-docker-local/internal-functions
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 # 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