From 5d80dcb64343103ef3262483a2a19ee930d89875 Mon Sep 17 00:00:00 2001
From: jon <jon.li@gllue.com>
Date: Fri, 15 Jun 2018 12:05:21 +0800
Subject: [PATCH 1/2] Delete container from restart list when container name is
 null

---
 docker-entrypoint | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker-entrypoint b/docker-entrypoint
index 15a917f..b9eb35e 100755
--- a/docker-entrypoint
+++ b/docker-entrypoint
@@ -50,8 +50,13 @@ if [ "$1" = 'autoheal' ] && [ -e ${DOCKER_SOCK} ]; then
     for CONTAINER in `ls $TMP_DIR`; do 
         DATE=$(date +%d-%m-%Y" "%H:%M:%S)
         CONTAINER_NAME=$(docker_curl -XGET http://localhost/containers/${CONTAINER}/json | jq -r .Name)
-        echo "$DATE Restarting container ${CONTAINER_NAME} (${CONTAINER:0:12})"
-        docker_curl -f -XPOST http://localhost/containers/${CONTAINER}/restart && rm "$TMP_DIR/$CONTAINER" || echo "$DATE Restarting container ${CONTAINER:0:12} failed"
+        if [ "null" = "$CONTAINER_NAME" ]; then
+          echo "$DATE Delete container ${CONTAINER_NAME} (${CONTAINER:0:12}) from restart list because container name null implies container is not exists"
+          rm "$TMP_DIR/$CONTAINER"
+        else
+          echo "$DATE Restarting container ${CONTAINER_NAME} (${CONTAINER:0:12})"
+          docker_curl -f -XPOST http://localhost/containers/${CONTAINER}/restart && rm "$TMP_DIR/$CONTAINER" || echo "$DATE Restarting container ${CONTAINER:0:12} failed"
+        fi
     done
   done
 

From caf3817b30befd98bf8425e681626a0ea8b62189 Mon Sep 17 00:00:00 2001
From: shidenggui <longlyshidenggui@gmail.com>
Date: Fri, 15 Jun 2018 16:38:12 +0800
Subject: [PATCH 2/2] Fix grammer error

---
 docker-entrypoint | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-entrypoint b/docker-entrypoint
index b9eb35e..b0921af 100755
--- a/docker-entrypoint
+++ b/docker-entrypoint
@@ -51,7 +51,7 @@ if [ "$1" = 'autoheal' ] && [ -e ${DOCKER_SOCK} ]; then
         DATE=$(date +%d-%m-%Y" "%H:%M:%S)
         CONTAINER_NAME=$(docker_curl -XGET http://localhost/containers/${CONTAINER}/json | jq -r .Name)
         if [ "null" = "$CONTAINER_NAME" ]; then
-          echo "$DATE Delete container ${CONTAINER_NAME} (${CONTAINER:0:12}) from restart list because container name null implies container is not exists"
+          echo "$DATE Delete container ${CONTAINER_NAME} (${CONTAINER:0:12}) from restart list because container name null implies container does not exist"
           rm "$TMP_DIR/$CONTAINER"
         else
           echo "$DATE Restarting container ${CONTAINER_NAME} (${CONTAINER:0:12})"