need to call /build for herokuish

This commit is contained in:
Michael Hobbs
2015-04-20 16:52:44 -07:00
parent a801592b56
commit 2e9bb4eed1
3 changed files with 4 additions and 4 deletions

View File

@@ -65,8 +65,8 @@ __Solution (Less solution, more helpful troubleshooting steps):__
Find the failed phase's container image (*077581956a92* in this example) Find the failed phase's container image (*077581956a92* in this example)
``` ```
root@dokku:~# docker ps -a | grep builder root@dokku:~# docker ps -a | grep build
94d9515e6d93 077581956a92 "/build/builder" 29 minutes ago Exited (0) 25 minutes ago cocky_bell 94d9515e6d93 077581956a92 "/build" 29 minutes ago Exited (0) 25 minutes ago cocky_bell
``` ```
Start a new container with the failed image and poke around (i.e. ensure you can access the internet from within the container or attempt the failed command, if known) Start a new container with the failed image and poke around (i.e. ensure you can access the internet from within the container or attempt the failed command, if known)

View File

@@ -24,7 +24,7 @@ case "$1" in
# https://github.com/progrium/dokku/issues/896 & https://github.com/progrium/dokku/issues/906 # https://github.com/progrium/dokku/issues/896 & https://github.com/progrium/dokku/issues/906
DOCKER_ARGS=$(: | pluginhook docker-args $APP build) DOCKER_ARGS=$(: | pluginhook docker-args $APP build)
DOCKER_ARGS+=$(: | pluginhook docker-args-build $APP) DOCKER_ARGS+=$(: | pluginhook docker-args-build $APP)
id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build/builder) id=$(docker run -d -v $CACHE_DIR:/cache -e CACHE_PATH=/cache $DOCKER_ARGS $IMAGE /build)
docker attach $id docker attach $id
test "$(docker wait $id)" -eq 0 test "$(docker wait $id)" -eq 0
docker commit $id $IMAGE > /dev/null docker commit $id $IMAGE > /dev/null

View File

@@ -6,7 +6,7 @@ release_and_deploy() {
source "$(dirname $0)/../common/functions" source "$(dirname $0)/../common/functions"
local APP="$1"; local IMAGE="dokku/$APP" local APP="$1"; local IMAGE="dokku/$APP"
if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then if verify_image "$IMAGE"; then
if is_image_herokuish_based "$IMAGE"; then if is_image_herokuish_based "$IMAGE"; then
IMAGE_SOURCE_TYPE="herokuish" IMAGE_SOURCE_TYPE="herokuish"
else else