From 0082d0d961b355e40f3b43f14eb41b509a71886f Mon Sep 17 00:00:00 2001
From: Werner Beroux <werner@beroux.com>
Date: Wed, 8 Jul 2015 14:45:55 +0200
Subject: [PATCH] Make entrypoint.sh the entrypoint.

Eventhou it is the ENTRYPOINT, it will just work
as if it was the CMD because it exec all arguments.
---
 Dockerfile    | 3 ++-
 entrypoint.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6a39162..42cf3e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,4 +21,5 @@ USER ngrok
 
 EXPOSE 4040
 
-CMD ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/bin/ngrok"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 67b3fc0..43a2f3d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 if [ "$1" = "/bin/sh" ]; then
   shift
@@ -55,4 +55,4 @@ case "$1" in
   *)        ARGS="$PROTOCOL $ARGS -log stdout $* $FWD" ;;
 esac
 
-exec /bin/ngrok $ARGS
+exec "$@"