Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2026-02-24 04:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add $DOCKER_ARGS and docker-args pluginhook to dokku deploy and command run.

Browse Source
This commit is contained in:
Dyson Simmons
2013-11-29 15:52:26 +11:00
parent 56de22a3c8
commit aaa4f0fade
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dokku
View File

@@ -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"

6
plugins/00_dokku-standard/commands
View File

@@ -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)