Merge pull request #358 from dyson/DOCKER_ARGS

For #304: Add $DOCKER_ARGS and docker-args pluginhook to dokku deploy and command run.
This commit is contained in:
rhy-jot committed 2013-12-02 12:59:52 -08:00
commit c77cbf1d3a
2 files changed
+5 -2

No files matched your search

+2 -1
View File
@@ -63,7 +63,8 @@ case "$1" in
fi fi
# start the app # 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" echo $id > "$DOKKU_ROOT/$APP/CONTAINER"
port=$(docker port $id 5000 | sed 's/0.0.0.0://') port=$(docker port $id 5000 | sed 's/0.0.0.0://')
echo $port > "$DOKKU_ROOT/$APP/PORT" echo $port > "$DOKKU_ROOT/$APP/PORT"
+3 -1
View File
@@ -58,7 +58,9 @@ case "$1" in
exit 1 exit 1
fi fi
shift 2 shift 2
docker run -i -t $IMAGE /exec "$@"
DOCKER_ARGS=$(: | pluginhook docker-args $APP)
docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@"
;; ;;
url) url)