Merge pull request #1511 from shipwright-io/tweak/heruko-buildpacks-s…

…amples Fix Heruko buildpacks samples that failed to determine the target OS
shipwright-io · Feb 29, 2024 · d084af1 · d084af1
2 parents 1cdb949 + c2d4725
commit d084af1
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 2 deletions.
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
@@ -8,13 +8,23 @@ spec:
     - name: platform-env
       emptyDir: {}
   parameters:
+    - name: operating-system
+      description: The target operating system for the buildpacks build.
+      default: "linux"
+    - name: system-architecture
+      description: The target system architecture for the buildpacks build.
+      default: "x86_64"
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
       default: "0.7"
   buildSteps:
     - name: build-and-push
       image: heroku/builder:22
       env:
+        - name: CNB_TARGET_OS
+          value: $(params.operating-system)
+        - name: CNB_TARGET_ARCH
+          value: $(params.system-architecture)
         - name: CNB_PLATFORM_API
           value: $(params.platform-api-version)
         - name: PARAM_SOURCE_CONTEXT
@@ -62,7 +72,7 @@ spec:
           mkdir -p "$CACHE_DIR" "$LAYERS_DIR"
 
           function announce_phase {
-            printf "===> %s\n" "$1" 
+            printf "===> %s\n" "$1"
           }
 
           announce_phase "ANALYZING"

diff --git a/...1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml b/...1alpha1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml
@@ -8,13 +8,23 @@ spec:
     - name: platform-env
       emptyDir: {}
   parameters:
+    - name: operating-system
+      description: The target operating system for the buildpacks build.
+      default: "linux"
+    - name: system-architecture
+      description: The target system architecture for the buildpacks build.
+      default: "x86_64"
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
       default: "0.7"
   buildSteps:
     - name: build-and-push
       image: heroku/builder:22
       env:
+        - name: CNB_TARGET_OS
+          value: $(params.operating-system)
+        - name: CNB_TARGET_ARCH
+          value: $(params.system-architecture)
         - name: CNB_PLATFORM_API
           value: $(params.platform-api-version)
         - name: PARAM_SOURCE_CONTEXT

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
@@ -8,13 +8,23 @@ spec:
     - name: platform-env
       emptyDir: {}
   parameters:
+    - name: operating-system
+      description: The target operating system for the buildpacks build.
+      default: "linux"
+    - name: system-architecture
+      description: The target system architecture for the buildpacks build.
+      default: "x86_64"
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
       default: "0.7"
   steps:
     - name: build-and-push
       image: heroku/builder:22
       env:
+        - name: CNB_TARGET_OS
+          value: $(params.operating-system)
+        - name: CNB_TARGET_ARCH
+          value: $(params.system-architecture)
         - name: CNB_PLATFORM_API
           value: $(params.platform-api-version)
         - name: PARAM_SOURCE_CONTEXT
@@ -62,7 +72,7 @@ spec:
           mkdir -p "$CACHE_DIR" "$LAYERS_DIR"
 
           function announce_phase {
-            printf "===> %s\n" "$1" 
+            printf "===> %s\n" "$1"
           }
 
           announce_phase "ANALYZING"

diff --git a/...v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml b/...v1beta1/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml
@@ -8,13 +8,23 @@ spec:
     - name: platform-env
       emptyDir: {}
   parameters:
+    - name: operating-system
+      description: The target operating system for the buildpacks build.
+      default: "linux"
+    - name: system-architecture
+      description: The target system architecture for the buildpacks build.
+      default: "x86_64"
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
       default: "0.7"
   steps:
     - name: build-and-push
       image: heroku/builder:22
       env:
+        - name: CNB_TARGET_OS
+          value: $(params.operating-system)
+        - name: CNB_TARGET_ARCH
+          value: $(params.system-architecture)
         - name: CNB_PLATFORM_API
           value: $(params.platform-api-version)
         - name: PARAM_SOURCE_CONTEXT