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

respect custom stack when using cloud native builder

Browse Source
This commit is contained in:
Niklas Tasler
2021-05-30 17:54:39 +02:00
parent 765bc82028
commit e38905765b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/builder-pack/builder-build
View File

@@ -14,8 +14,10 @@ trigger-builder-pack-builder-build() {
fi fi
local stack="$(plugn trigger buildpack-stack-name "$APP")" local stack="$(plugn trigger buildpack-stack-name "$APP")"
if [[ -z "$stack" ]]; then if [[ -n "$stack" ]]; then
DOKKU_CNB_STACK="$stack" DOKKU_CNB_STACK="$stack"
else
DOKKU_CNB_STACK="$DOKKU_CNB_BUILDER"
fi fi
dokku_log_info1 "Building $APP from cnb stack $DOKKU_CNB_STACK (experimental)..." dokku_log_info1 "Building $APP from cnb stack $DOKKU_CNB_STACK (experimental)..."
@@ -35,7 +37,7 @@ trigger-builder-pack-builder-build() {
plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR" plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR"
pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --path "$SOURCECODE_WORK_DIR" --default-process web pack build "$IMAGE" --builder "$DOKKU_CNB_STACK" --path "$SOURCECODE_WORK_DIR" --default-process web
docker-image-labeler --label=com.dokku.image-stage=build --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE" docker-image-labeler --label=com.dokku.image-stage=build --label=com.dokku.app-name=$APP --label=org.label-schema.schema-version=1.0 --label=org.label-schema.vendor=dokku --label=dokku "$IMAGE"