From a17d0baf382b3727b7ce11064700a921fecef921 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom@weave.works>
Date: Tue, 11 Aug 2015 13:53:55 +0000
Subject: [PATCH] Support --probe.foo=bar style in entrypoint.sh

---
 docker/entrypoint.sh | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index bda182507..bf07420a6 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -16,39 +16,48 @@ while true; do
         --dns)
             [ $# -gt 1 ] || usage
             DNS_SERVER="$2"
-            shift 2
+            shift
             ;;
         --searchpath)
             [ $# -gt 1 ] || usage
             SEARCHPATH="$2"
-            shift 2
+            shift
             ;;
         --app.*)
-            [ $# -gt 1 ] || usage
-            ARG_NAME=$(echo "$1" | sed 's/\-\-app\.//')
-            ARG_VALUE="$2"
-            shift 2
+            if echo "$1" | grep "="; then
+                ARG_NAME=$(echo "$1" | sed 's/\-\-app\.\([^=]*\)=\(.*\)/\1/')
+                ARG_VALUE=$(echo "$1" | sed 's/\-\-app\.\([^=]*\)=\(.*\)/\2/')
+            else
+                [ $# -gt 1 ] || usage
+                ARG_NAME=$(echo "$1" | sed 's/\-\-app\.//')
+                ARG_VALUE="$2"
+                shift
+            fi
             APP_ARGS="$APP_ARGS -$ARG_NAME=$ARG_VALUE"
             ;;
         --probe.*)
-            [ $# -gt 1 ] || usage
-            ARG_NAME=$(echo "$1" | sed 's/\-\-probe\.//')
-            ARG_VALUE="$2"
-            shift 2
+            if echo "$1" | grep "="; then
+                ARG_NAME=$(echo "$1" | sed 's/\-\-probe\.\([^=]*\)=\(.*\)/\1/')
+                ARG_VALUE=$(echo "$1" | sed 's/\-\-probe\.\([^=]*\)=\(.*\)/\2/')
+            else
+                [ $# -gt 1 ] || usage
+                ARG_NAME=$(echo "$1" | sed 's/\-\-probe\.//')
+                ARG_VALUE="$2"
+                shift
+            fi
             PROBE_ARGS="$PROBE_ARGS -$ARG_NAME=$ARG_VALUE"
             ;;
         --no-app)
             touch /etc/service/app/down
-            shift 1
             ;;
         --no-probe)
             touch /etc/service/probe/down
-            shift 1
             ;;
         *)
             break
             ;;
     esac
+    shift
 done
 
 mkdir -p /etc/weave