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

Merge pull request #317 from plietar/master

Browse Source 
Enable tracing in hooks when DOKKU_TRACE is set.
This commit is contained in:
rhy-jot
2013-11-18 13:23:44 -08:00
parent 805c5a27c6 158c3d215b
commit 5e1e903d51
11 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dokku
View File

@@ -1,7 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x set -eo pipefail
export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
export DOKKU_ROOT=${DOKKU_ROOT:="/home/dokku"} export DOKKU_ROOT=${DOKKU_ROOT:="/home/dokku"}
export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
[[ -f $DOKKU_ROOT/dokkurc ]] && source $DOKKU_ROOT/dokkurc
[[ $DOKKU_TRACE ]] && set -x
case "$1" in case "$1" in
receive) receive)

2
plugins/00_dokku-standard/commands
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
case "$1" in case "$1" in
delete) delete)
if [[ -z $2 ]]; then if [[ -z $2 ]]; then

2
plugins/00_dokku-standard/install
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
sed -i 's/docker -d$/docker -d -r=true/' /etc/init/docker.conf sed -i 's/docker -d$/docker -d -r=true/' /etc/init/docker.conf

2
plugins/00_dokku-standard/post-delete
View File

@@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
[[ -n $1 ]] && rm -r "$DOKKU_ROOT/$1" > /dev/null [[ -n $1 ]] && rm -r "$DOKKU_ROOT/$1" > /dev/null

2
plugins/config/commands
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
# Check if name is specified # Check if name is specified
if [[ $1 == config ]] || [[ $1 == config:* ]]; then if [[ $1 == config ]] || [[ $1 == config:* ]]; then

2
plugins/git/commands
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
case "$1" in case "$1" in
git-hook) git-hook)

2
plugins/nginx-vhosts/commands
View File

@@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
cat cat

2
plugins/nginx-vhosts/install
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
# latest stable NGINX 1.4.x with websocket support # latest stable NGINX 1.4.x with websocket support
add-apt-repository -y ppa:nginx/stable add-apt-repository -y ppa:nginx/stable

2
plugins/nginx-vhosts/post-delete
View File

@@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
sudo /etc/init.d/nginx reload > /dev/null sudo /etc/init.d/nginx reload > /dev/null

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

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
APP="$1"; PORT="$2" APP="$1"; PORT="$2"
WILDCARD_SSL="$DOKKU_ROOT/ssl" WILDCARD_SSL="$DOKKU_ROOT/ssl"
SSL="$DOKKU_ROOT/$APP/ssl" SSL="$DOKKU_ROOT/$APP/ssl"

3
tests/ci/receiver
View File

@@ -13,6 +13,9 @@ if [[ $2 == *dokku* ]]; then
DEBIAN_FRONTEND=noninteractive apt-get install -y git make curl software-properties-common DEBIAN_FRONTEND=noninteractive apt-get install -y git make curl software-properties-common
echo "-----> Set hostname to dokku.me" echo "-----> Set hostname to dokku.me"
hostname dokku.me hostname dokku.me
echo "-----> Enabling tracing"
mkdir -p /home/dokku
echo "export DOKKU_TRACE=1" >> /home/dokku/dokkurc
echo "-----> Running make install" echo "-----> Running make install"
DEBIAN_FRONTEND=noninteractive make install DEBIAN_FRONTEND=noninteractive make install
echo "-----> Generating keypair..." echo "-----> Generating keypair..."