From 767b45ae562795442fdc70ecfb71c8918f7543cc Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 19 Mar 2015 08:09:11 -0700 Subject: [PATCH] use config:set-norestart --- plugins/00_dokku-standard/commands | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands index fe558aa51..6f8ca6642 100755 --- a/plugins/00_dokku-standard/commands +++ b/plugins/00_dokku-standard/commands @@ -36,13 +36,8 @@ case "$1" in dockerfile) # extract first port from Dockerfile DOCKERFILE_PORT=$(grep EXPOSE Dockerfile | head -1 | awk '{ print $2 }') - if [[ -n "$DOCKERFILE_PORT" ]];then - if [[ -f "$DOKKU_ROOT/$APP/ENV" ]] && [[ "$(grep DOKKU_DOCKERFILE_PORT $DOKKU_ROOT/$APP/ENV) > /dev/null 2>&1; echo $?" == "0" ]];then - sed -i -e "s:DOKKU_DOCKERFILE_PORT=.*:DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT:g" "$DOKKU_ROOT/$APP/ENV" - else - echo "export DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT" >> "$DOKKU_ROOT/$APP/ENV" - fi - fi + [[ -n "$DOCKERFILE_PORT" ]] && dokku config:set-norestart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT + # sticking with same pattern of building app image before pre-build for now. docker build -t "$IMAGE" . # buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!