fixes #1259 now ignores protocol of Dockerfile EXPOSE

2015-07-03 18:14:23 -07:00
parent 5aada53945
commit 5f8b2d291c
2 changed files with 4 additions and 2 deletions
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -36,7 +36,7 @@ case "$1" in

      dockerfile)
        # extract first port from Dockerfile
-        DOCKERFILE_PORT=$(grep EXPOSE Dockerfile | head -1 | awk '{ print $2 }' || true)
+        DOCKERFILE_PORT=$(grep "^EXPOSE \+[[:digit:]]\+\(\/tcp\)\? *$" Dockerfile | head -1 | sed 's/EXPOSE \+\([[:digit:]]\+\)\(\/tcp\)\?.*/\1/' || true)
        [[ -n "$DOCKERFILE_PORT" ]] && dokku config:set-norestart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT

        # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!