fix: correct calls to docker build and import common functions
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
|
||||||
trigger-builder-dockerfile-builder-release() {
|
trigger-builder-dockerfile-builder-release() {
|
||||||
declare desc="builder-dockerfile builder-release plugin trigger"
|
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"
|
plugn trigger pre-release-dockerfile "$APP" "$IMAGE_TAG"
|
||||||
|
|
||||||
local IMAGE=$(get_app_image_name "$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"
|
plugn trigger post-release-dockerfile "$APP" "$IMAGE_TAG"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
|
|
||||||
trigger-builder-herokuish-builder-release() {
|
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
|
"$DOCKER_BIN" container commit "${DOCKER_COMMIT_LABEL_ARGS[@]}" "$CID" "$IMAGE" >/dev/null
|
||||||
fi
|
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"
|
plugn trigger post-release-buildpack "$APP" "$IMAGE_TAG"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user