From 9aa5f7a85b05437873948a9e1e864e48c36bdf20 Mon Sep 17 00:00:00 2001 From: Ahmed Al Hafoudh Date: Thu, 31 Oct 2013 16:13:57 +0100 Subject: [PATCH] Fixed port redirection issues --- dokku | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dokku b/dokku index 66c1a015a..95b214a2b 100755 --- a/dokku +++ b/dokku @@ -46,21 +46,20 @@ case "$1" in deploy) APP="$2"; IMAGE="$3" pluginhook pre-deploy $APP $IMAGE - if [[ ! -f "$DOKKU_ROOT/$APP/PORT" ]]; then - # First deploy - id=$(docker run -d -p 5000 -e PORT=5000 $IMAGE /bin/bash -c "/start web") - echo $id > "$DOKKU_ROOT/$APP/CONTAINER" - port=$(docker port $id 5000 | sed 's/0.0.0.0://') - echo $port > "$DOKKU_ROOT/$APP/PORT" - echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$port" > "$DOKKU_ROOT/$APP/URL" - else - # Regular deploy + + # kill the app when running + if [[ -f "$DOKKU_ROOT/$APP/PORT" ]]; then oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER") docker kill $oldid > /dev/null - port=$(< "$DOKKU_ROOT/$APP/PORT") - id=$(docker run -d -p ":$port" -e "PORT=$port" $IMAGE /bin/bash -c "/start web") - echo $id > "$DOKKU_ROOT/$APP/CONTAINER" fi + + # start the app + id=$(docker run -d -p 5000 -e PORT=5000 $IMAGE /bin/bash -c "/start web") + echo $id > "$DOKKU_ROOT/$APP/CONTAINER" + port=$(docker port $id 5000 | sed 's/0.0.0.0://') + echo $port > "$DOKKU_ROOT/$APP/PORT" + echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$port" > "$DOKKU_ROOT/$APP/URL" + pluginhook post-deploy $APP $port ;;