From 8b7b70ee91bc6a29aff6f60799da000736620a47 Mon Sep 17 00:00:00 2001
From: Werner Beroux <werner@beroux.com>
Date: Fri, 10 Jul 2015 14:35:28 +0200
Subject: [PATCH] Revert "Make entrypoint.sh the entrypoint."

This reverts commit 0082d0d961b355e40f3b43f14eb41b509a71886f.
---
 Dockerfile    | 3 +--
 entrypoint.sh | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

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