Browse Source

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.
Werner Beroux 9 years ago
parent
commit
0082d0d961
2 changed files with 4 additions and 3 deletions
  1. 2 1
      Dockerfile
  2. 2 2
      entrypoint.sh

+ 2 - 1
Dockerfile

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

+ 2 - 2
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 "$@"