mirror/catalog
1
0
Fork 0
mirror of https://github.com/tektoncd/catalog.git synced 2024-11-24 06:15:46 +00:00
Code Issues Releases Activity

Update buildpacks task platform API to 0.3

Browse Source 
This change makes it so that the tekton task is compatible with
the latest changes from the Cloud Native Buildpacks.

Notably,

- Support for cred helpers has been removed. ([#259](https://github.com/buildpacks/lifecycle/pull/259))
- Default process type is configurable. ([#243](https://github.com/buildpacks/lifecycle/pull/260))

Resolves #194

Signed-off-by: Javier Romero <rjavier@vmware.com>
This commit is contained in:
Javier Romero 2020-03-31 16:59:00 -05:00 committed by tekton-robot
parent 3a5126ef53
commit d391b0261f
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
buildpacks/README.md
View File

@ -18,30 +18,27 @@ The Cloud Native Buildpacks website describes v3 buildpacks as:
kubectl apply -f https://raw.githubusercontent.com/tektoncd/catalog/master/buildpacks/buildpacks-v3.yaml
```
> **NOTE:** This task is currently only compatible with Tekton **v0.6.0** and above, and CNB Platform API 0.2 (lifecycle v0.6.0 and above). For previous Platform API versions, [see below](#previous-platform-api-versions).
> **NOTE:** This task is currently only compatible with Tekton **v0.6.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).
## Inputs
### Parameters
* **`BUILDER_IMAGE`**: The image on which builds will run (must include v3 lifecycle and compatible buildpacks; _required_)
* **`BUILDER_IMAGE`**: The image on which builds will run. (must include v3 lifecycle and compatible buildpacks; _required_)
* **`USE_CRED_HELPERS`**: Use Docker credential helpers. Set to `"true"` or
`"false"` as string a value. (_default:_ `"false"`)
* **`CACHE`**: The name of the persistent app cache volume. (_default:_ an empty directory -- effectively no cache)
* **`CACHE`**: The name of the persistent app cache volume (_default:_ an empty
directory -- effectively no cache)
* **`USER_ID`**: The user ID of the builder image user, as a string value. (_default:_ `"1000"`)
* **`USER_ID`**: The user ID of the builder image user, as a string value (_default:_ `"1000"`)
* **`GROUP_ID`**: The group ID of the builder image user, as a string value. (_default:_ `"1000"`)
* **`GROUP_ID`**: The group ID of the builder image user, as a string value (_default:_ `"1000"`)
* **`PROCESS_TYPE`**: The default process type to set on the image. (_default:_ `"web"`)
* **`SOURCE_SUBPATH`**: A subpath within the `source` input where the source to build is located (_default:_ `""`)
* **`SOURCE_SUBPATH`**: A subpath within the `source` input where the source to build is located. (_default:_ `""`)
### Resources
* **`source`**: A `git`-type `PipelineResource` specifying the location of the
source to build. See `SOURCE_SUBPATH` above if source is located within a subpath of this input.
* **`source`**: A `git`-type `PipelineResource` specifying the location of the source to build. See `SOURCE_SUBPATH` above if source is located within a subpath of this input.
## Outputs
@ -107,10 +104,18 @@ Heroku:
Use one of the following commands to install a previous version of this task. Be sure to also supply a compatible builder image (`BUILDER_IMAGE` input) when running the task (i.e. one that has a lifecycle implementing the expected platform API).
### CNB Platform API 0.2
Commit: [8c34055](https://github.com/tektoncd/catalog/tree/8c34055ea728413fb72af061e7bcbf1859a9fbd6/buildpacks#inputs)
```
kubectl -f https://raw.githubusercontent.com/tektoncd/catalog/8c34055ea728413fb72af061e7bcbf1859a9fbd6/buildpacks/buildpacks-v3.yaml
```
### CNB Platform API 0.1
Commit: [5c2ab7d6](https://github.com/tektoncd/catalog/tree/5c2ab7d6c3b2507d43b49577d7f1bee9c49ed8ab/buildpacks#inputs)
```
kubectl -f https://github.com/tektoncd/catalog/blob/5c2ab7d6c3b2507d43b49577d7f1bee9c49ed8ab/buildpacks/buildpacks-v3.yaml
kubectl -f https://raw.githubusercontent.com/tektoncd/catalog/5c2ab7d6c3b2507d43b49577d7f1bee9c49ed8ab/buildpacks/buildpacks-v3.yaml
```

17
buildpacks/buildpacks-v3.yaml
View File

@ -8,18 +8,18 @@ spec:
params:
- name: BUILDER_IMAGE
description: The image on which builds will run (must include v3 lifecycle and compatible buildpacks).
- name: USE_CRED_HELPERS
description: Use Docker credential helpers for Google's GCR, Amazon's ECR, or Microsoft's ACR.
default: "false"
- name: CACHE
description: The name of the persistent app cache volume
description: The name of the persistent app cache volume.
default: empty-dir
- name: USER_ID
description: The user ID of the builder image user
description: The user ID of the builder image user.
default: "1000"
- name: GROUP_ID
description: The group ID of the builder image user
description: The group ID of the builder image user.
default: "1000"
- name: PROCESS_TYPE
description: The default process type to set on the image.
default: "web"
- name: SOURCE_SUBPATH
description: A subpath within the `source` input where the source to build is located.
default: ""
@ -36,7 +36,7 @@ spec:
stepTemplate:
env:
- name: CNB_PLATFORM_API
value: "0.2"
value: "0.3"
steps:
- name: prepare
@ -76,7 +76,6 @@ spec:
command: ["/cnb/lifecycle/analyzer"]
args:
- "-layers=/layers"
- "-helpers=$(inputs.params.USE_CRED_HELPERS)"
- "-group=/layers/group.toml"
- "-cache-dir=/cache"
- "$(outputs.resources.image.url)"
@ -120,9 +119,9 @@ spec:
args:
- "-app=/workspace/source/$(inputs.params.SOURCE_SUBPATH)"
- "-layers=/layers"
- "-helpers=$(inputs.params.USE_CRED_HELPERS)"
- "-group=/layers/group.toml"
- "-cache-dir=/cache"
- "-process-type=$(inputs.params.PROCESS_TYPE)"
- "$(outputs.resources.image.url)"
volumeMounts:
- name: layers-dir

2
buildpacks/tests/run.yaml
View File

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