fix: properly set label args on dockerfile and herokuish-built images
This commit is contained in:
1 parent
8f7f03a7d8
commit
6b50ba66a9
2 files changed
+2
-2
No files matched your search
@@ -36,7 +36,7 @@ trigger-builder-dockerfile-builder-build() {
|
|||||||
declare -a ARG_ARRAY
|
declare -a ARG_ARRAY
|
||||||
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
eval "ARG_ARRAY=($DOCKER_ARGS)"
|
||||||
|
|
||||||
"$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .
|
"$DOCKER_BIN" image build $DOCKER_BUILD_LABEL_ARGS $DOKKU_GLOBAL_BUILD_ARGS "${ARG_ARRAY[@]}" "${DOKKU_DOCKER_BUILD_OPTS[@]}" -t $IMAGE .
|
||||||
|
|
||||||
plugn trigger post-build-dockerfile "$APP"
|
plugn trigger post-build-dockerfile "$APP"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ trigger-builder-herokuish-builder-release() {
|
|||||||
config_export global >"$TMP_WORK_DIR/00-global-env.sh"
|
config_export global >"$TMP_WORK_DIR/00-global-env.sh"
|
||||||
config_export app "$APP" >"$TMP_WORK_DIR/01-app-env.sh"
|
config_export app "$APP" >"$TMP_WORK_DIR/01-app-env.sh"
|
||||||
|
|
||||||
if ! suppress_output "$DOCKER_BIN" image build "${DOCKER_BUILD_LABEL_ARGS[@]}" $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
|
if ! suppress_output "$DOCKER_BIN" image build $DOCKER_BUILD_LABEL_ARGS $DOKKU_GLOBAL_BUILD_ARGS -f "$PLUGIN_AVAILABLE_PATH/builder-herokuish/dockerfiles/builder-release.Dockerfile" --build-arg APP_IMAGE="$IMAGE" -t $IMAGE "$TMP_WORK_DIR"; then
|
||||||
dokku_log_warn "Failure injecting environment variables"
|
dokku_log_warn "Failure injecting environment variables"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in new issue
Block a user