Merge pull request #317 from plietar/master

Enable tracing in hooks when DOKKU_TRACE is set.
This commit is contained in:
rhy-jot
2013-11-18 13:23:44 -08:00
11 changed files with 19 additions and 12 deletions

8
dokku
View File

@@ -1,7 +1,11 @@
#!/usr/bin/env bash
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
set -eo pipefail
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
receive)

View File

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

View File

@@ -1,5 +1,5 @@
#!/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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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