Update Buildpacks strategy

shipwright-io · Jun 20, 2023 · 45a96b8 · 45a96b8
1 parent 2bc9bb4
commit 45a96b8
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 42 deletions.
diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml
@@ -10,13 +10,11 @@ spec:
   parameters:
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
-      default: "0.4"
+      default: "0.7"
   buildSteps:
     - name: build-and-push
-      image: heroku/buildpacks:18
+      image: heroku/buildpacks:20
       env:
-        - name: ALLOW_INSECURE_HEROKU_18_BUILDER
-          value: "1"
         - name: CNB_PLATFORM_API
           value: $(params.platform-api-version)
         - name: PARAM_SOURCE_CONTEXT
@@ -58,23 +56,23 @@ spec:
             fi
           done
 
-          LAYERS_DIR=/tmp/layers
-          CACHE_DIR=/tmp/cache
+          LAYERS_DIR=/tmp/.shp/layers
+          CACHE_DIR=/tmp/.shp/cache
 
-          mkdir "$CACHE_DIR" "$LAYERS_DIR"
+          mkdir -p "$CACHE_DIR" "$LAYERS_DIR"
 
           function announce_phase {
             printf "===> %s\n" "$1" 
           }
 
+          announce_phase "ANALYZING"
+          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" "${PARAM_OUTPUT_IMAGE}"
+
           announce_phase "DETECTING"
           /cnb/lifecycle/detector -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
 
-          announce_phase "ANALYZING"
-          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" -cache-dir="$CACHE_DIR" "${PARAM_OUTPUT_IMAGE}"
-
           announce_phase "RESTORING"
-          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR"
+          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR" -layers="$LAYERS_DIR"
 
           announce_phase "BUILDING"
           /cnb/lifecycle/builder -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
@@ -86,7 +84,7 @@ spec:
           /cnb/lifecycle/exporter "${exporter_args[@]}" "${PARAM_OUTPUT_IMAGE}"
 
           # Store the image digest
-          grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+          grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
       volumeMounts:
         - mountPath: /platform/env
           name: platform-env

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml
@@ -10,13 +10,11 @@ spec:
   parameters:
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
-      default: "0.4"
+      default: "0.7"
   buildSteps:
     - name: build-and-push
-      image: heroku/buildpacks:18
+      image: heroku/buildpacks:20
       env:
-        - name: ALLOW_INSECURE_HEROKU_18_BUILDER
-          value: "1"
         - name: CNB_PLATFORM_API
           value: $(params.platform-api-version)
         - name: PARAM_SOURCE_CONTEXT
@@ -58,23 +56,23 @@ spec:
             fi
           done
 
-          LAYERS_DIR=/tmp/layers
-          CACHE_DIR=/tmp/cache
+          LAYERS_DIR=/tmp/.shp/layers
+          CACHE_DIR=/tmp/.shp/cache
 
-          mkdir "$CACHE_DIR" "$LAYERS_DIR"
+          mkdir -p "$CACHE_DIR" "$LAYERS_DIR"
 
           function announce_phase {
             printf "===> %s\n" "$1" 
           }
 
+          announce_phase "ANALYZING"
+          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" "${PARAM_OUTPUT_IMAGE}"
+
           announce_phase "DETECTING"
           /cnb/lifecycle/detector -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
 
-          announce_phase "ANALYZING"
-          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" -cache-dir="$CACHE_DIR" "${PARAM_OUTPUT_IMAGE}"
-
           announce_phase "RESTORING"
-          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR"
+          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR" -layers="$LAYERS_DIR"
 
           announce_phase "BUILDING"
           /cnb/lifecycle/builder -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
@@ -86,7 +84,7 @@ spec:
           /cnb/lifecycle/exporter "${exporter_args[@]}" "${PARAM_OUTPUT_IMAGE}"
 
           # Store the image digest
-          grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+          grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
       volumeMounts:
         - mountPath: /platform/env
           name: platform-env

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml
@@ -10,7 +10,7 @@ spec:
   parameters:
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
-      default: "0.4"
+      default: "0.7"
   buildSteps:
     - name: build-and-push
       image: docker.io/paketobuildpacks/builder-jammy-full:latest
@@ -56,23 +56,23 @@ spec:
             fi
           done
 
-          LAYERS_DIR=/tmp/layers
-          CACHE_DIR=/tmp/cache
+          LAYERS_DIR=/tmp/.shp/layers
+          CACHE_DIR=/tmp/.shp/cache
 
-          mkdir "$CACHE_DIR" "$LAYERS_DIR"
+          mkdir -p "$CACHE_DIR" "$LAYERS_DIR"
 
           function announce_phase {
             printf "===> %s\n" "$1" 
           }
 
+          announce_phase "ANALYZING"
+          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" "${PARAM_OUTPUT_IMAGE}"
+
           announce_phase "DETECTING"
           /cnb/lifecycle/detector -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
 
-          announce_phase "ANALYZING"
-          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" -cache-dir="$CACHE_DIR" "${PARAM_OUTPUT_IMAGE}"
-
           announce_phase "RESTORING"
-          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR"
+          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR" -layers="$LAYERS_DIR"
 
           announce_phase "BUILDING"
           /cnb/lifecycle/builder -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
@@ -84,7 +84,7 @@ spec:
           /cnb/lifecycle/exporter "${exporter_args[@]}" "${PARAM_OUTPUT_IMAGE}"
 
           # Store the image digest
-          grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+          grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
       volumeMounts:
         - mountPath: /platform/env
           name: platform-env

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml
@@ -10,7 +10,7 @@ spec:
   parameters:
     - name: platform-api-version
       description: The referenced version is the minimum version that all relevant buildpack implementations support.
-      default: "0.4"
+      default: "0.7"
   buildSteps:
     - name: build-and-push
       image: docker.io/paketobuildpacks/builder-jammy-full:latest
@@ -56,23 +56,23 @@ spec:
             fi
           done
 
-          LAYERS_DIR=/tmp/layers
-          CACHE_DIR=/tmp/cache
+          LAYERS_DIR=/tmp/.shp/layers
+          CACHE_DIR=/tmp/.shp/cache
 
-          mkdir "$CACHE_DIR" "$LAYERS_DIR"
+          mkdir -p "$CACHE_DIR" "$LAYERS_DIR"
 
           function announce_phase {
             printf "===> %s\n" "$1" 
           }
 
+          announce_phase "ANALYZING"
+          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" "${PARAM_OUTPUT_IMAGE}"
+
           announce_phase "DETECTING"
           /cnb/lifecycle/detector -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
 
-          announce_phase "ANALYZING"
-          /cnb/lifecycle/analyzer -layers="$LAYERS_DIR" -cache-dir="$CACHE_DIR" "${PARAM_OUTPUT_IMAGE}"
-
           announce_phase "RESTORING"
-          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR"
+          /cnb/lifecycle/restorer -cache-dir="$CACHE_DIR" -layers="$LAYERS_DIR"
 
           announce_phase "BUILDING"
           /cnb/lifecycle/builder -app="${PARAM_SOURCE_CONTEXT}" -layers="$LAYERS_DIR"
@@ -84,7 +84,7 @@ spec:
           /cnb/lifecycle/exporter "${exporter_args[@]}" "${PARAM_OUTPUT_IMAGE}"
 
           # Store the image digest
-          grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+          grep digest /tmp/report.toml | tail -n 1 | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
       volumeMounts:
         - mountPath: /platform/env
           name: platform-env