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

Merge pull request #974 from progrium/mh-cleaner-pipefail-guard

Browse Source 
don't use set to guard against pipefail
This commit is contained in:
Jose Diaz-Gonzalez
2015-02-11 21:52:53 -05:00
parent 870ca86ba6 043b055558
commit 64fa098d2c
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/nginx-vhosts/bind-external-ip
View File

@@ -2,7 +2,7 @@
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
APP="$1" APP="$1"
set +e; NO_VHOST=$(dokku config:get $APP NO_VHOST); set -e NO_VHOST=$(dokku config:get $APP NO_VHOST || true)
RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}" RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}"

3
plugins/nginx-vhosts/post-deploy
View File

@@ -3,8 +3,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$(dirname $0)/../common/functions" source "$(dirname $0)/../common/functions"
APP="$1"; PORT="$2"; IP="$3" APP="$1"; PORT="$2"; IP="$3"
NO_VHOST=$(dokku config:get $APP NO_VHOST || true)
set +e; NO_VHOST=$(dokku config:get $APP NO_VHOST); set -e
if [[ -n "$NO_VHOST" ]]; then if [[ -n "$NO_VHOST" ]]; then
dokku_log_info1 "NO_VHOST config detected" dokku_log_info1 "NO_VHOST config detected"