From 93080498f6167bae87256de6c74cfb2dc96a25a7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 18 Feb 2020 23:05:44 -0500 Subject: [PATCH] fix: correct calls to docker build and import common functions --- plugins/builder-dockerfile/builder-release | 3 ++- plugins/builder-herokuish/builder-release | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/builder-dockerfile/builder-release b/plugins/builder-dockerfile/builder-release index 3906e904a..5ef84ad14 100755 --- a/plugins/builder-dockerfile/builder-release +++ b/plugins/builder-dockerfile/builder-release @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -eo pipefail [[ $DOKKU_TRACE ]] && set -x +source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions" trigger-builder-dockerfile-builder-release() { declare desc="builder-dockerfile builder-release plugin trigger" @@ -15,7 +16,7 @@ trigger-builder-dockerfile-builder-release() { plugn trigger pre-release-dockerfile "$APP" "$IMAGE_TAG" local IMAGE=$(get_app_image_name "$APP" "$IMAGE_TAG") - echo "FROM $IMAGE" | docker build --label=com.dokku.image-stage=release -t "$IMAGE" - + echo "FROM $IMAGE" | "$DOCKER_BIN" image build --label=com.dokku.image-stage=release -t "$IMAGE" - plugn trigger post-release-dockerfile "$APP" "$IMAGE_TAG" } diff --git a/plugins/builder-herokuish/builder-release b/plugins/builder-herokuish/builder-release index f7b552e14..b371d186c 100755 --- a/plugins/builder-herokuish/builder-release +++ b/plugins/builder-herokuish/builder-release @@ -1,6 +1,7 @@ #!/usr/bin/env bash set -eo pipefail [[ $DOKKU_TRACE ]] && set -x +source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions" source "$PLUGIN_AVAILABLE_PATH/config/functions" trigger-builder-herokuish-builder-release() { @@ -37,7 +38,7 @@ trigger-builder-herokuish-builder-release() { "$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null fi - echo "FROM $IMAGE" | docker build --label=com.dokku.image-stage=release -t "$IMAGE" - + echo "FROM $IMAGE" | "$DOCKER_BIN" image build --label=com.dokku.image-stage=release -t "$IMAGE" - plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG" }