From e38905765b8cd6fc22d7e1d039c3d1de3f1dc8b4 Mon Sep 17 00:00:00 2001 From: Niklas Tasler Date: Sun, 30 May 2021 17:54:39 +0200 Subject: [PATCH 1/4] respect custom stack when using cloud native builder --- plugins/builder-pack/builder-build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index d1dcd96f8..6c965bd2f 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -14,8 +14,10 @@ trigger-builder-pack-builder-build() { fi local stack="$(plugn trigger buildpack-stack-name "$APP")" - if [[ -z "$stack" ]]; then + if [[ -n "$stack" ]]; then DOKKU_CNB_STACK="$stack" + else + DOKKU_CNB_STACK="$DOKKU_CNB_BUILDER" fi 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" - 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" From 3d745b7c12f900de56509d65766294bd1231d761 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 30 May 2021 15:30:02 -0400 Subject: [PATCH 2/4] chore: use one fewer variable --- plugins/builder-pack/builder-build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index 6c965bd2f..f26c8b930 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -15,9 +15,7 @@ trigger-builder-pack-builder-build() { local stack="$(plugn trigger buildpack-stack-name "$APP")" if [[ -n "$stack" ]]; then - DOKKU_CNB_STACK="$stack" - else - DOKKU_CNB_STACK="$DOKKU_CNB_BUILDER" + DOKKU_CNB_BUILDER="$stack" fi dokku_log_info1 "Building $APP from cnb stack $DOKKU_CNB_STACK (experimental)..." @@ -37,7 +35,7 @@ trigger-builder-pack-builder-build() { plugn trigger pre-build-pack "$APP" "$SOURCECODE_WORK_DIR" - pack build "$IMAGE" --builder "$DOKKU_CNB_STACK" --path "$SOURCECODE_WORK_DIR" --default-process web + pack build "$IMAGE" --builder "$DOKKU_CNB_BUILDER" --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" From c969a1a742f0252b9a40c120de25a9ff0c7a64c5 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 30 May 2021 15:31:19 -0400 Subject: [PATCH 3/4] fix: use correct variable --- plugins/builder-pack/builder-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index f26c8b930..93dcd6b70 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -18,7 +18,7 @@ trigger-builder-pack-builder-build() { DOKKU_CNB_BUILDER="$stack" fi - dokku_log_info1 "Building $APP from cnb stack $DOKKU_CNB_STACK (experimental)..." + dokku_log_info1 "Building $APP from cnb stack $DOKKU_CNB_BUILDER (experimental)..." if ! command -v "pack" &>/dev/null; then dokku_log_fail "Missing pack, install it" From 8bbeb90f6fff74773d236bad76da41bd5f89a9c9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 30 May 2021 15:32:54 -0400 Subject: [PATCH 4/4] docs: use correct variable name --- docs/deployment/builders/cloud-native-buildpacks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment/builders/cloud-native-buildpacks.md b/docs/deployment/builders/cloud-native-buildpacks.md index 17d2734cd..fbaf1db37 100644 --- a/docs/deployment/builders/cloud-native-buildpacks.md +++ b/docs/deployment/builders/cloud-native-buildpacks.md @@ -69,7 +69,7 @@ dokku buildpacks:set-property node-js-app stack A change in the stack builder value will execute the `post-stack-set` trigger. -Finally, stack builders can be set or unset globally as a fallback. This will take precedence over a globally set `DOKKU_CNB_STACK` environment variable (`heroku/buildpacks` by default). +Finally, stack builders can be set or unset globally as a fallback. This will take precedence over a globally set `DOKKU_CNB_BUILDER` environment variable (`heroku/buildpacks` by default). ```shell # set globally