Merge pull request #491 from SaschaSchwarze0/sascha-455-buildpacks-si…

…ngle-step Use single step for all four Buildpacks lifecycle phases
shipwright-io · Nov 24, 2020 · ebfe068 · ebfe068
2 parents cef2040 + 5955ad6
commit ebfe068
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 266 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,51 +10,17 @@ spec:
       securityContext:
         runAsUser: 0
         capabilities:
-          add: ["CHOWN"]
+          add: 
+            - CHOWN
       command:
         - /bin/bash
       args:
         - -c
         - >
-          chown -R "1000:1000" "/workspace/source" &&
-          chown -R "1000:1000" "/tekton/home"
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-    - name: step-detect
-      image: heroku/buildpacks:18
-      securityContext:
-        runAsUser: 1000
-      command:
-        - /cnb/lifecycle/detector
-      args:
-        - -app=/workspace/source/$(build.source.contextDir)
-        - -group=/layers/group.toml
-        - -plan=/layers/plan.toml
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-      volumeMounts:
-        - name: layers-dir
-          mountPath: /layers
-    - name: step-restore
-      image: heroku/buildpacks:18
-      securityContext:
-        runAsUser: 1000
-      command:
-        - /cnb/lifecycle/restorer
-      args:
-        - -layers=/layers
-        - -cache-dir=/cache
-        - -group=/layers/group.toml
+          chown -R "1000:1000" /workspace/source &&
+          chown -R "1000:1000" /tekton/home &&
+          chown -R "1000:1000" /cache &&
+          chown -R "1000:1000" /layers
       resources:
         limits:
           cpu: 500m
@@ -67,38 +33,17 @@ spec:
           mountPath: /cache
         - name: layers-dir
           mountPath: /layers
-    - name: step-build
+    - name: step-create
       image: heroku/buildpacks:18
       securityContext:
         runAsUser: 1000
+        runAsGroup: 1000
       command:
-        - /cnb/lifecycle/builder
-      args:
-        - -app=/workspace/source/$(build.source.contextDir)
-        - -layers=/layers
-        - -group=/layers/group.toml
-        - -plan=/layers/plan.toml
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-      volumeMounts:
-        - name: layers-dir
-          mountPath: /layers
-    - name: step-export
-      image: heroku/buildpacks:18
-      securityContext:
-        runAsUser: 0
-      command:
-        - /cnb/lifecycle/exporter
+        - /cnb/lifecycle/creator
       args:
         - -app=/workspace/source/$(build.source.contextDir)
-        - -layers=/layers
         - -cache-dir=/cache
-        - -group=/layers/group.toml
+        - -layers=/layers
         - $(build.output.image)
       resources:
         limits:

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,51 +10,17 @@ spec:
       securityContext:
         runAsUser: 0
         capabilities:
-          add: ["CHOWN"]
+          add: 
+            - CHOWN
       command:
         - /bin/bash
       args:
         - -c
         - >
-          chown -R "1000:1000" "/workspace/source" &&
-          chown -R "1000:1000" "/tekton/home"
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-    - name: step-detect
-      image: heroku/buildpacks:18
-      securityContext:
-        runAsUser: 1000
-      command:
-        - /cnb/lifecycle/detector
-      args:
-        - -app=/workspace/source/$(build.source.contextDir)
-        - -group=/layers/group.toml
-        - -plan=/layers/plan.toml
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-      volumeMounts:
-        - name: layers-dir
-          mountPath: /layers
-    - name: step-restore
-      image: heroku/buildpacks:18
-      securityContext:
-        runAsUser: 1000
-      command:
-        - /cnb/lifecycle/restorer
-      args:
-        - -layers=/layers
-        - -cache-dir=/cache
-        - -group=/layers/group.toml
+          chown -R "1000:1000" /workspace/source &&
+          chown -R "1000:1000" /tekton/home &&
+          chown -R "1000:1000" /cache &&
+          chown -R "1000:1000" /layers
       resources:
         limits:
           cpu: 500m
@@ -67,38 +33,17 @@ spec:
           mountPath: /cache
         - name: layers-dir
           mountPath: /layers
-    - name: step-build
+    - name: step-create
       image: heroku/buildpacks:18
       securityContext:
         runAsUser: 1000
+        runAsGroup: 1000
       command:
-        - /cnb/lifecycle/builder
-      args:
-        - -app=/workspace/source/$(build.source.contextDir)
-        - -layers=/layers
-        - -group=/layers/group.toml
-        - -plan=/layers/plan.toml
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-      volumeMounts:
-        - name: layers-dir
-          mountPath: /layers
-    - name: step-export
-      image: heroku/buildpacks:18
-      securityContext:
-        runAsUser: 0
-      command:
-        - /cnb/lifecycle/exporter
+        - /cnb/lifecycle/creator
       args:
         - -app=/workspace/source/$(build.source.contextDir)
-        - -layers=/layers
         - -cache-dir=/cache
-        - -group=/layers/group.toml
+        - -layers=/layers
         - $(build.output.image)
       resources:
         limits:

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml
@@ -10,53 +10,17 @@ spec:
       securityContext:
         runAsUser: 0
         capabilities:
-          add: ["CHOWN"]
+          add: 
+            - CHOWN
       command:
         - /bin/bash
       args:
         - -c
         - >
-          chown -R "1000:1000" "/workspace/source" &&
-          chown -R "1000:1000" "/tekton/home"
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-    - name: step-detect
-      image: docker.io/paketobuildpacks/builder:full
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-      command:
-        - /cnb/lifecycle/detector
-      args:
-        - -app=/workspace/source/$(build.source.contextDir)
-        - -group=/layers/group.toml
-        - -plan=/layers/plan.toml
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-      volumeMounts:
-        - name: layers-dir
-          mountPath: /layers
-    - name: step-restore
-      image: docker.io/paketobuildpacks/builder:full
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-      command:
-        - /cnb/lifecycle/restorer
-      args:
-        - -layers=/layers
-        - -cache-dir=/cache
-        - -group=/layers/group.toml
+          chown -R "1000:1000" /workspace/source &&
+          chown -R "1000:1000" /tekton/home &&
+          chown -R "1000:1000" /cache &&
+          chown -R "1000:1000" /layers
       resources:
         limits:
           cpu: 500m
@@ -69,40 +33,17 @@ spec:
           mountPath: /cache
         - name: layers-dir
           mountPath: /layers
-    - name: step-build
-      image: docker.io/paketobuildpacks/builder:full
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-      command:
-        - /cnb/lifecycle/builder
-      args:
-        - -app=/workspace/source/$(build.source.contextDir)
-        - -layers=/layers
-        - -group=/layers/group.toml
-        - -plan=/layers/plan.toml
-      resources:
-        limits:
-          cpu: 500m
-          memory: 1Gi
-        requests:
-          cpu: 250m
-          memory: 65Mi
-      volumeMounts:
-        - name: layers-dir
-          mountPath: /layers
-    - name: step-export
+    - name: step-create
       image: docker.io/paketobuildpacks/builder:full
       securityContext:
         runAsUser: 1000
         runAsGroup: 1000
       command:
-        - /cnb/lifecycle/exporter
+        - /cnb/lifecycle/creator
       args:
         - -app=/workspace/source/$(build.source.contextDir)
-        - -layers=/layers
         - -cache-dir=/cache
-        - -group=/layers/group.toml
+        - -layers=/layers
         - $(build.output.image)
       resources:
         limits: