diff --git a/plugins/builder-pack/builder-build b/plugins/builder-pack/builder-build index 7d303a143..237c54bde 100755 --- a/plugins/builder-pack/builder-build +++ b/plugins/builder-pack/builder-build @@ -52,40 +52,6 @@ trigger-builder-pack-builder-build() { PACK_ARGS+=("$2") shift 2 ;; - -r | --buildpack-registry) - PACK_ARGS+=("--buildpack-registry") - PACK_ARGS+=("$2") - shift 2 - ;; - -d | --descriptor) - PACK_ARGS+=("--descriptor") - PACK_ARGS+=("$2") - shift 2 - ;; - -e | --env) - PACK_ARGS+=("--env") - PACK_ARGS+=("$2") - shift 2 - ;; - -t | --tag) - PACK_ARGS+=("--tag") - PACK_ARGS+=("$2") - shift 2 - ;; - --cache | --cache-image | --creation-time | --docker-host | --env-file | --extension | --gid | --insecure-registry | --lifecycle-image | --network | --platform | --post-buildpack | --pre-buildpack | --previous-image | --pull-policy | --report-output-dir | --run-image | --sbom-output-dir | --uid | --workspace) - PACK_ARGS+=("$1") - PACK_ARGS+=("$2") - shift 2 - ;; - --clear-cache | --disable-system-buildpacks | --publish | --trust-builder | --trust-extra-buildpacks | --userns-host) - PACK_ARGS+=("$1") - shift 1 - ;; - --volume | -v) - PACK_ARGS+=("--volume") - PACK_ARGS+=("$2") - shift 2 - ;; -b=* | --buildpack=*) if [[ "$1" == "--buildpack=*" ]]; then PACK_ARGS+=("--buildpack" "${1#--buildpack=}") @@ -94,6 +60,11 @@ trigger-builder-pack-builder-build() { fi shift 1 ;; + -r | --buildpack-registry) + PACK_ARGS+=("--buildpack-registry") + PACK_ARGS+=("$2") + shift 2 + ;; -r=* | --buildpack-registry=*) if [[ "$1" == "--buildpack-registry=*" ]]; then PACK_ARGS+=("--buildpack-registry" "${1#--buildpack-registry=}") @@ -102,6 +73,11 @@ trigger-builder-pack-builder-build() { fi shift 2 ;; + -d | --descriptor) + PACK_ARGS+=("--descriptor") + PACK_ARGS+=("$2") + shift 2 + ;; -d=* | --descriptor=*) if [[ "$1" == "--descriptor=*" ]]; then PACK_ARGS+=("--descriptor" "${1#--descriptor=}") @@ -110,6 +86,11 @@ trigger-builder-pack-builder-build() { fi shift 1 ;; + -e | --env) + PACK_ARGS+=("--env") + PACK_ARGS+=("$2") + shift 2 + ;; -e=* | --env=*) if [[ "$1" == "--env=*" ]]; then PACK_ARGS+=("--env" "${1#--env=}") @@ -118,6 +99,11 @@ trigger-builder-pack-builder-build() { fi shift 1 ;; + -t | --tag) + PACK_ARGS+=("--tag") + PACK_ARGS+=("$2") + shift 2 + ;; -t=* | --tag=*) if [[ "$1" == "--tag=*" ]]; then PACK_ARGS+=("--tag" "${1#--tag=}") @@ -126,6 +112,11 @@ trigger-builder-pack-builder-build() { fi shift 1 ;; + --volume | -v) + PACK_ARGS+=("--volume") + PACK_ARGS+=("$2") + shift 2 + ;; --volume=* | -v=*) if [[ "$1" == "--volume=*" ]]; then PACK_ARGS+=("--volume" "${1#--volume=}") @@ -134,6 +125,15 @@ trigger-builder-pack-builder-build() { fi shift 1 ;; + --cache | --cache-image | --creation-time | --docker-host | --env-file | --extension | --gid | --insecure-registry | --lifecycle-image | --network | --platform | --post-buildpack | --pre-buildpack | --previous-image | --pull-policy | --report-output-dir | --run-image | --sbom-output-dir | --uid | --workspace) + PACK_ARGS+=("$1") + PACK_ARGS+=("$2") + shift 2 + ;; + --clear-cache | --disable-system-buildpacks | --publish | --trust-builder | --trust-extra-buildpacks | --userns-host) + PACK_ARGS+=("$1") + shift 1 + ;; *) continue ;;