github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify docker run logic in deploy

Browse Source
This commit is contained in:
Michael Hobbs
2015-07-24 12:15:10 -07:00
parent da5f42a13e
commit 9593bd6d48
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dokku
View File

@@ -101,15 +101,17 @@ case "$1" in
START_CMD=$(dokku config:get $APP DOKKU_DOCKERFILE_START_CMD || $START_CMD) START_CMD=$(dokku config:get $APP DOKKU_DOCKERFILE_START_CMD || $START_CMD)
fi fi
[[ "$PROC_TYPE" == "web" ]] && port=${DOKKU_DOCKERFILE_PORT:=5000} if [[ "$PROC_TYPE" == "web" ]]; then
if [[ "$BIND_EXTERNAL" = "false" ]] && [[ "$PROC_TYPE" == "web" ]];then port=${DOKKU_DOCKERFILE_PORT:=5000}
id=$(docker run -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD) if [[ "$BIND_EXTERNAL" = "true" ]];then
ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $id) id=$(docker run -d -p $port -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
elif [[ "$BIND_EXTERNAL" = "true" ]] && [[ "$PROC_TYPE" == "web" ]];then port=$(docker port $id $port | sed 's/[0-9.]*://')
id=$(docker run -d -p $port -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD) ipaddr=127.0.0.1
port=$(docker port $id $port | sed 's/[0-9.]*://') else
ipaddr=127.0.0.1 id=$(docker run -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
elif [[ "$PROC_TYPE" != "web" ]];then ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $id)
fi
else
id=$(docker run -d $DOCKER_ARGS $IMAGE $START_CMD) id=$(docker run -d $DOCKER_ARGS $IMAGE $START_CMD)
fi fi