Merge pull request #859 from progrium/829-docker-args-command

Pass command being executed when retrieving DOCKER_ARGS via pluginhook.
This commit is contained in:
Jose Diaz-Gonzalez committed 2015-01-01 21:16:44 -05:00
commit 8535900f9d
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -81,7 +81,7 @@ case "$1" in
fi fi
# start the app # start the app
DOCKER_ARGS=$(: | pluginhook docker-args $APP) DOCKER_ARGS=$(: | pluginhook docker-args $APP deploy)
id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE /bin/bash -c "/start web") id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE /bin/bash -c "/start web")
port=$(docker port $id 5000 | sed 's/[0-9.]*://') port=$(docker port $id 5000 | sed 's/[0-9.]*://')
+1 -1
View File
@@ -48,7 +48,7 @@ case "$1" in
shift 2 shift 2
DOCKER_ARGS=$(: | pluginhook docker-args $APP) DOCKER_ARGS=$(: | pluginhook docker-args $APP run)
docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@" docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@"
;; ;;