Browse Source

Revert "Make entrypoint.sh the entrypoint."

This reverts commit 0082d0d961b355e40f3b43f14eb41b509a71886f.
Werner Beroux 9 years ago
parent
commit
8b7b70ee91
2 changed files with 3 additions and 4 deletions
  1. 1 2
      Dockerfile
  2. 2 2
      entrypoint.sh

+ 1 - 2
Dockerfile

@@ -21,5 +21,4 @@ USER ngrok
 
 EXPOSE 4040
 
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/bin/ngrok"]
+CMD ["/entrypoint.sh"]

+ 2 - 2
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