diff --git a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml index a6f9165852..ff3b7e936a 100644 --- a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml +++ b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml @@ -16,7 +16,11 @@ spec: default: "x86_64" - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: List of registries to consider insecure (http or self-signed certificate). + type: array + defaults: [] buildSteps: - name: build-and-push image: heroku/builder:22 @@ -31,11 +35,38 @@ spec: value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE value: $(params.shp-output-image) + - name: PARAM_OUTPUT_INSECURE + value: $(params.shp-output-insecure) command: - /bin/bash args: - -c - | + insecureRegistries="" + inInsecureRegistries=false + + if [[ "${PARAM_OUTPUT_INSECURE}" == "true" ]]; then + while [[ $# -gt 0 ]]; do + arg="$1" + shift + + if [ "${arg}" == "--insecure-registries" ]; then + inInsecureRegistries=true + elif [ "${inInsecureRegistries}" == "true" ]; then + insecureRegistries="${insecureRegistries}${arg}," + else + echo "Invalid usage" + exit 1 + fi + done + fi + + if [[ ! -z "$insecureRegistries" ]]; then + echo "> Using insecure registries: $insecureRegistries" + + export CNB_INSECURE_REGISTRIES=$insecureRegistries + fi + set -euo pipefail echo "> Processing environment variables..." @@ -95,6 +126,9 @@ spec: # Store the image digest grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)" + - -- + - --insecure-registries + - $(params.insecure-registries[*]) volumeMounts: - mountPath: /platform/env name: platform-env diff --git a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml index 22b1800339..e5d4eb2358 100644 --- a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml +++ b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml @@ -16,7 +16,11 @@ spec: default: "x86_64" - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: List of registries to consider insecure (http or self-signed certificate). + type: array + defaults: [] buildSteps: - name: build-and-push image: heroku/builder:22 @@ -31,11 +35,38 @@ spec: value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE value: $(params.shp-output-image) + - name: PARAM_OUTPUT_INSECURE + value: $(params.shp-output-insecure) command: - /bin/bash args: - -c - | + insecureRegistries="" + inInsecureRegistries=false + + if [[ "${PARAM_OUTPUT_INSECURE}" == "true" ]]; then + while [[ $# -gt 0 ]]; do + arg="$1" + shift + + if [ "${arg}" == "--insecure-registries" ]; then + inInsecureRegistries=true + elif [ "${inInsecureRegistries}" == "true" ]; then + insecureRegistries="${insecureRegistries}${arg}," + else + echo "Invalid usage" + exit 1 + fi + done + fi + + if [[ ! -z "$insecureRegistries" ]]; then + echo "> Using insecure registries: $insecureRegistries" + + export CNB_INSECURE_REGISTRIES=$insecureRegistries + fi + set -euo pipefail echo "> Processing environment variables..." @@ -95,6 +126,9 @@ spec: # Store the image digest grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)" + - -- + - --insecure-registries + - $(params.insecure-registries[*]) volumeMounts: - mountPath: /platform/env name: platform-env diff --git a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml index ca67cc1bfa..9901dcf6e0 100644 --- a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml +++ b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml @@ -10,7 +10,11 @@ spec: parameters: - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: List of registries to consider insecure (http or self-signed certificate). + type: array + defaults: [] buildSteps: - name: build-and-push image: docker.io/paketobuildpacks/builder-jammy-full:latest @@ -21,11 +25,38 @@ spec: value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE value: $(params.shp-output-image) + - name: PARAM_OUTPUT_INSECURE + value: $(params.shp-output-insecure) command: - /bin/bash args: - -c - | + insecureRegistries="" + inInsecureRegistries=false + + if [[ "${PARAM_OUTPUT_INSECURE}" == "true" ]]; then + while [[ $# -gt 0 ]]; do + arg="$1" + shift + + if [ "${arg}" == "--insecure-registries" ]; then + inInsecureRegistries=true + elif [ "${inInsecureRegistries}" == "true" ]; then + insecureRegistries="${insecureRegistries}${arg}," + else + echo "Invalid usage" + exit 1 + fi + done + fi + + if [[ ! -z "$insecureRegistries" ]]; then + echo "> Using insecure registries: $insecureRegistries" + + export CNB_INSECURE_REGISTRIES=$insecureRegistries + fi + set -euo pipefail echo "> Processing environment variables..." @@ -85,6 +116,9 @@ spec: # Store the image digest grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)" + - -- + - --insecure-registries + - $(params.insecure-registries[*]) volumeMounts: - mountPath: /platform/env name: platform-env diff --git a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml index 91081f8cca..2d35274630 100644 --- a/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml +++ b/samples/v1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml @@ -10,7 +10,11 @@ spec: parameters: - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: List of registries to consider insecure (http or self-signed certificate). + type: array + defaults: [] buildSteps: - name: build-and-push image: docker.io/paketobuildpacks/builder-jammy-full:latest @@ -21,11 +25,38 @@ spec: value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE value: $(params.shp-output-image) + - name: PARAM_OUTPUT_INSECURE + value: $(params.shp-output-insecure) command: - /bin/bash args: - -c - | + insecureRegistries="" + inInsecureRegistries=false + + if [[ "${PARAM_OUTPUT_INSECURE}" == "true" ]]; then + while [[ $# -gt 0 ]]; do + arg="$1" + shift + + if [ "${arg}" == "--insecure-registries" ]; then + inInsecureRegistries=true + elif [ "${inInsecureRegistries}" == "true" ]; then + insecureRegistries="${insecureRegistries}${arg}," + else + echo "Invalid usage" + exit 1 + fi + done + fi + + if [[ ! -z "$insecureRegistries" ]]; then + echo "> Using insecure registries: $insecureRegistries" + + export CNB_INSECURE_REGISTRIES=$insecureRegistries + fi + set -euo pipefail echo "> Processing environment variables..." @@ -85,6 +116,9 @@ spec: # Store the image digest grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)" + - -- + - --insecure-registries + - $(params.insecure-registries[*]) volumeMounts: - mountPath: /platform/env name: platform-env diff --git a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml index c0c39cb502..158446717d 100644 --- a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml +++ b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml @@ -16,7 +16,10 @@ spec: default: "x86_64" - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: Comma separated list of registries to consider insecure (http or self-signed certificate). + default: "" steps: - name: build-and-push image: heroku/builder:22 @@ -27,6 +30,8 @@ spec: value: $(params.system-architecture) - name: CNB_PLATFORM_API value: $(params.platform-api-version) + - name: CNB_INSECURE_REGISTRIES + value: $(params.insecure-registries) - name: PARAM_SOURCE_CONTEXT value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE diff --git a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml index 249c071fa4..e38809a185 100644 --- a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml +++ b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml @@ -16,7 +16,10 @@ spec: default: "x86_64" - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: Comma separated list of registries to consider insecure (http or self-signed certificate). + default: "" steps: - name: build-and-push image: heroku/builder:22 @@ -27,6 +30,8 @@ spec: value: $(params.system-architecture) - name: CNB_PLATFORM_API value: $(params.platform-api-version) + - name: CNB_INSECURE_REGISTRIES + value: $(params.insecure-registries) - name: PARAM_SOURCE_CONTEXT value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE diff --git a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml index d6d9fd6649..9d6fc826c7 100644 --- a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml +++ b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml @@ -10,13 +10,18 @@ spec: parameters: - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: Comma separated list of registries to consider insecure (http or self-signed certificate). + default: "" steps: - name: build-and-push image: docker.io/paketobuildpacks/builder-jammy-full:latest env: - name: CNB_PLATFORM_API value: $(params.platform-api-version) + - name: CNB_INSECURE_REGISTRIES + value: $(params.insecure-registries) - name: PARAM_SOURCE_CONTEXT value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE diff --git a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml index 2374f8a135..0dcdf005f4 100644 --- a/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml +++ b/samples/v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml @@ -10,13 +10,18 @@ spec: parameters: - name: platform-api-version description: The referenced version is the minimum version that all relevant buildpack implementations support. - default: "0.12" + default: "0.13" + - name: insecure-registries + description: Comma separated list of registries to consider insecure (http or self-signed certificate). + default: "" steps: - name: build-and-push image: docker.io/paketobuildpacks/builder-jammy-full:latest env: - name: CNB_PLATFORM_API value: $(params.platform-api-version) + - name: CNB_INSECURE_REGISTRIES + value: $(params.insecure-registries) - name: PARAM_SOURCE_CONTEXT value: $(params.shp-source-context) - name: PARAM_OUTPUT_IMAGE