From 78503ed17855643507f66f3c596b191c06e0558e Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Tue, 3 Apr 2018 01:36:51 -0400
Subject: [PATCH] feat: handle case where old, renamed containers may still be
 running during ps:restore

---
 plugins/ps/subcommands/restore             |  3 +++
 plugins/scheduler-docker-local/pre-restore | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 plugins/scheduler-docker-local/pre-restore

diff --git a/plugins/ps/subcommands/restore b/plugins/ps/subcommands/restore
index 9f37cf524..b9c209fd1 100755
--- a/plugins/ps/subcommands/restore
+++ b/plugins/ps/subcommands/restore
@@ -9,6 +9,9 @@ ps_restore_cmd() {
   local cmd="ps:restore"
   local APP="$2"
 
+  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  plugn trigger pre-restore "$DOKKU_SCHEDULER"
+
   if [[ -n "$APP" ]]; then
     if ! (is_deployed "$APP"); then
       dokku_log_warn "App $APP has not been deployed"
diff --git a/plugins/scheduler-docker-local/pre-restore b/plugins/scheduler-docker-local/pre-restore
new file mode 100755
index 000000000..660cd5193
--- /dev/null
+++ b/plugins/scheduler-docker-local/pre-restore
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+
+scheduler-docker-local-pre-restore() {
+  declare desc="scheduler-docker-local pre-restore plugin trigger"
+  declare trigger="scheduler-docker-local pre-restore"
+  declare DOKKU_SCHEDULER="$1"
+
+  if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
+    return
+  fi
+
+  # delete all "old" containers
+  # shellcheck disable=SC2046
+  docker rm $(docker ps --format "{{.Names}}" -a -f "label=$DOKKU_CONTAINER_LABEL" -q | grep -E '(.+\..+\.[0-9]+\.[0-9]+$)') &> /dev/null || true
+}
+
+scheduler-docker-local-pre-restore "$@"