github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: correct calls to docker build and import common functions

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-18 23:05:44 -05:00
parent 00f3d498a2
commit 93080498f6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/builder-dockerfile/builder-release
View File

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

3
plugins/builder-herokuish/builder-release
View File

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