From aaa4f0fade44f1748e4f322e039e3996a0f72b4f Mon Sep 17 00:00:00 2001 From: Dyson Simmons Date: Fri, 29 Nov 2013 15:52:26 +1100 Subject: [PATCH 1/2] Add $DOCKER_ARGS and docker-args pluginhook to dokku deploy and command run. --- dokku | 3 ++- plugins/00_dokku-standard/commands | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dokku b/dokku index 516b84ef2..dc804401d 100755 --- a/dokku +++ b/dokku @@ -63,7 +63,8 @@ case "$1" in fi # start the app - id=$(docker run -d -p 5000 -e PORT=5000 $IMAGE /bin/bash -c "/start web") + DOCKER_ARGS=$(pluginhook docker-args $APP) + id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE /bin/bash -c "/start web") echo $id > "$DOKKU_ROOT/$APP/CONTAINER" port=$(docker port $id 5000 | sed 's/0.0.0.0://') echo $port > "$DOKKU_ROOT/$APP/PORT" diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands index 4da27fa4b..38c334fa7 100755 --- a/plugins/00_dokku-standard/commands +++ b/plugins/00_dokku-standard/commands @@ -35,7 +35,7 @@ case "$1" in echo "App $APP does not exist" exit 1 fi - + if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then CONTAINER=$(<$DOKKU_ROOT/$APP/CONTAINER) docker logs $CONTAINER | tail -n 100 @@ -58,7 +58,9 @@ case "$1" in exit 1 fi shift 2 - docker run -i -t $IMAGE /exec "$@" + + DOCKER_ARGS=$(pluginhook docker-args $APP) + docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@" ;; url) From 1e76aba0af8c12ae265ac346019762873834f328 Mon Sep 17 00:00:00 2001 From: Dyson Simmons Date: Sun, 1 Dec 2013 00:14:01 +1100 Subject: [PATCH 2/2] Pipe no op into docker-args plugin-hooks to avoid problems when running over ssh w/o a pty. --- dokku | 2 +- plugins/00_dokku-standard/commands | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dokku b/dokku index dc804401d..c2848dc1f 100755 --- a/dokku +++ b/dokku @@ -63,7 +63,7 @@ case "$1" in fi # start the app - DOCKER_ARGS=$(pluginhook docker-args $APP) + DOCKER_ARGS=$(: | pluginhook docker-args $APP) id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE /bin/bash -c "/start web") echo $id > "$DOKKU_ROOT/$APP/CONTAINER" port=$(docker port $id 5000 | sed 's/0.0.0.0://') diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands index 38c334fa7..c87ba11ed 100755 --- a/plugins/00_dokku-standard/commands +++ b/plugins/00_dokku-standard/commands @@ -59,7 +59,7 @@ case "$1" in fi shift 2 - DOCKER_ARGS=$(pluginhook docker-args $APP) + DOCKER_ARGS=$(: | pluginhook docker-args $APP) docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@" ;;