Rename buildpacks-separate-phases to buildpacks-phases, to reduce length

Additionally, remove commented out references to ADDITIONAL_TAGS; that will be added as a separate issue.

Signed-off-by: David Freilich <[email protected]>

task/buildpacks-separate-phases/0.1/README.md → task/buildpacks-phases/0.1/README.md

@@ -10,7 +10,7 @@ See also [`buildpacks`](../buildpacks) for the combined version of this task, wh
 ## Install the Task
 
 ```
-kubectl apply -f https://raw.githubusercontent.com/tektoncd/catalog/master/task/buildpacks-separate-phases/0.1/buildpacks-separate-phases.yaml
+kubectl apply -f https://raw.githubusercontent.com/tektoncd/catalog/master/task/buildpacks-phases/0.1/buildpacks-phases.yaml
 ```
 
 > **NOTE:** This task is currently only compatible with Tekton **v0.11.0** and above, and CNB Platform API 0.3 (lifecycle v0.7.0 and above). For previous Platform API versions, [see below](#previous-platform-api-versions).
@@ -52,7 +52,7 @@ metadata:
   name: example-run
 spec:
   taskRef:
-    name: buildpacks-separate-phases
+    name: buildpacks-phases
   podTemplate:
     volumes:
 # Uncomment the lines below to use an existing cache

task/buildpacks-separate-phases/0.1/buildpacks-separate-phases.yaml → task/buildpacks-phases/0.1/buildpacks-phases.yaml

@@ -2,16 +2,16 @@
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: buildpacks-separate-phases
+  name: buildpacks-phases
   labels:
     app.kubernetes.io/version: "0.1"
   annotations:
     tekton.dev/pipelines.minVersion: "0.12.1"
     tekton.dev/tags: image-build
-    tekton.dev/displayName: "buildpacks-separate-phases"
+    tekton.dev/displayName: "buildpacks-phases"
 spec:
   description: >-
-    The Buildpacks-Separate-Phases task builds source into a container image and pushes it to
+    The Buildpacks-Phases task builds source into a container image and pushes it to
     a registry, using Cloud Native Buildpacks. This command separately calls the aspects of the
     Cloud Native Buildpacks lifecycle, to provide more granular control over the construction of
     the image.

task/buildpacks-separate-phases/0.1/tests/run.yaml → task/buildpacks-phases/0.1/tests/run.yaml

@@ -2,7 +2,7 @@
 apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
-  name: buildpacks-separate-phases-test-pipeline
+  name: buildpacks-phases-test-pipeline
 spec:
   workspaces:
   - name: shared-workspace
@@ -23,9 +23,9 @@ spec:
       value: ""
     - name: deleteExisting
       value: "true"
-  - name: buildpacks
+  - name: buildpacks-phases
     taskRef:
-      name: buildpacks-separate-phases
+      name: buildpacks-phases
     runAfter:
     - fetch-repository
     workspaces:
@@ -46,10 +46,10 @@ spec:
 apiVersion: tekton.dev/v1beta1
 kind: PipelineRun
 metadata:
-  name: buildpacks-test-pipeline-run
+  name: buildpacks-phases-test-pipeline-run
 spec:
   pipelineRef:
-    name: buildpacks-test-pipeline
+    name: buildpacks-phases-test-pipeline
   workspaces:
   - name: shared-workspace
     persistentvolumeclaim:

task/buildpacks/0.1/README.md

@@ -4,7 +4,7 @@ This build template builds source into a container image using [Cloud Native Bui
 
 Cloud Native Buildpacks are pluggable, modular tools that transform application source code into OCI images. They replace Dockerfiles in the app development lifecycle, and enable for swift rebasing of images and modular control over images (through the use of builders), among other benefits. This command uses a builder to construct the image, and pushes it to the registry provided.
 
-See also [`buildpacks-separate-phases`](../buildpacks-separate-phases) for the deconstructed version of this task, which runs each of the [lifecycle phases](https://buildpacks.io/docs/concepts/components/lifecycle/#phases) individually (this task uses the [creator binary](https://github.com/buildpacks/spec/blob/platform/0.3/platform.md#operations), which coordinates and runs all of the phases).
+See also [`buildpacks-phases`](../buildpacks-phases) for the deconstructed version of this task, which runs each of the [lifecycle phases](https://buildpacks.io/docs/concepts/components/lifecycle/#phases) individually (this task uses the [creator binary](https://github.com/buildpacks/spec/blob/platform/0.3/platform.md#operations), which coordinates and runs all of the phases).
 
 ## Install the Task
 

task/buildpacks/0.1/buildpacks.yaml

@@ -49,9 +49,6 @@ spec:
     - name: RUN_IMAGE
       description: Reference to a run image to use
       default: ""
-      # - name: ADDITIONAL_TAGS
-      #   description: Additional space delimited tag(s) to apply to exported image
-      #   default: ""
 
   resources:
     outputs:
@@ -78,10 +75,6 @@ spec:
           chown -R "$(params.USER_ID):$(params.GROUP_ID)" "/layers" &&
           chown -R "$(params.USER_ID):$(params.GROUP_ID)" "/cache" &&
           chown -R "$(params.USER_ID):$(params.GROUP_ID)" "$(workspaces.source.path)"
-          # if [ -n "$(params.ADDITIONAL_TAGS)" ]; then
-          #   params.ADDITIONAL_TAGS=`echo $(params.ADDITIONAL_TAGS) | sed  -e 's/ / -tag=/g' -e 's/^/-tag=/'`
-          # fi
-          # echo $(params.ADDITIONAL_TAGS)
       volumeMounts:
         - name: layers-dir
           mountPath: /layers
@@ -106,7 +99,6 @@ spec:
         - "-previous-image=$(resources.outputs.image.url)"
         - "-run-image=$(params.RUN_IMAGE)"
         - "-uid=$(params.USER_ID)"
-        # - "$(params.ADDITIONAL_TAGS)"
         - "$(resources.outputs.image.url)"
       volumeMounts:
         - name: layers-dir

task/buildpacks/0.1/tests/run.yaml

@@ -35,7 +35,7 @@ spec:
     - name: SOURCE_SUBPATH
       value: apps/java-maven
     - name: BUILDER_IMAGE
-      value: cnbs/sample-builder:alpine-p0.3
+      value: cnbs/sample-builder:alpine
     - name: CACHE
       value: buildpacks-cache
     resources: