Commit 4b5312cb authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/obsolete-packeto-images' into 'master' 

fix: replace default builder image (obsolete)

Closes #5

See merge request to-be-continuous/cnb!36
parents 49642285 05a23804

README.md

+8 −8
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ include: 
  - component: $CI_SERVER_FQDN/to-be-continuous/cnb/gitlab-ci-cnb@3.1.0

    # 2: set/override component inputs

    inputs:

      builder-image: "registry.hub.docker.com/heroku/buildpacks:20" # ⚠ this is only an example

      builder-image: "docker.io/heroku/buildpacks:20" # ⚠ this is only an example

```



### Use as a CI/CD template (legacy)
@@ -34,7 +34,7 @@ include: 


variables:

  # 2: set/override template variables

  CNB_BUILDER_IMAGE: "registry.hub.docker.com/heroku/buildpacks:20" # ⚠ this is only an example

  CNB_BUILDER_IMAGE: "docker.io/heroku/buildpacks:20" # ⚠ this is only an example

```



## Understanding the CNB template
@@ -45,7 +45,7 @@ The CNB template uses some global configuration used throughout all jobs. 


| Input / Variable | Description                            | Default value     |

| --------------------- | -------------------------------------- | ----------------- |

| `builder-image` / `CNB_BUILDER_IMAGE` | The CNB builder image used to build your application image<br/>_depending on your needs, [choose the most appropriate one](https://paketo.io/docs/concepts/builders/#what-paketo-builders-are-available)_ | `registry.hub.docker.com/paketobuildpacks/builder:base` |

| `builder-image` / `CNB_BUILDER_IMAGE` | The CNB builder image used to build your application image<br/>_depending on your needs, [choose the most appropriate one](https://paketo.io/docs/concepts/builders/#what-paketo-builders-are-available)_ | `docker.io/paketobuildpacks/builder-jammy-base:latest` |

| `platform-api` / `CNB_PLATFORM_API` | The CNB [platform API version](https://github.com/buildpacks/spec/blob/main/platform.md#platform-api-version) | `0.9` |



### Available Builders
@@ -55,10 +55,10 @@ Depending on your needs and preferences, you are free to choose whichever CNB co 
| Input / Variable | Builder Image                    | Description     |

| --------------------- | -------------------------------- | ----------------- |

|	[Google](https://github.com/GoogleCloudPlatform/buildpacks) | `gcr.io/buildpacks/builder:v1`   | Ubuntu 18 base image with buildpacks for .NET, Go, Java, Node.js, and Python |

|	[Heroku](https://github.com/heroku/builder) | `registry.hub.docker.com/heroku/buildpacks:20`           | Base builder for Heroku-20 stack, based on ubuntu:20.04 base image |

|	[Paketo](https://hub.docker.com/r/paketobuildpacks/builder) (_base_) | `registry.hub.docker.com/paketobuildpacks/builder:base`  | Ubuntu bionic base image with buildpacks for Java, .NET Core, NodeJS, Go, Python, Ruby, Apache HTTPD, NGINX and Procfile |

|	[Paketo](https://hub.docker.com/r/paketobuildpacks/builder) (_full_) | `registry.hub.docker.com/paketobuildpacks/builder:full`  | Ubuntu bionic base image with buildpacks for Java, .NET Core, NodeJS, Go, Python, PHP, Ruby, Apache HTTPD, NGINX and Procfile |

|	[Paketo](https://hub.docker.com/r/paketobuildpacks/builder) (_tiny_) | `registry.hub.docker.com/paketobuildpacks/builder:tiny`  | Tiny base image (bionic build image, distroless-like run image) with buildpacks for Java, Java Native Image and Go |

|	[Heroku](https://github.com/heroku/builder) | `docker.io/heroku/buildpacks:20`           | Base builder for Heroku-20 stack, based on ubuntu:20.04 base image |

|	[Paketo](https://hub.docker.com/r/paketobuildpacks/builder) (_base_) | `docker.io/paketobuildpacks/builder-jammy-base:latest`  | Ubuntu Jammy (22.04) base image with buildpacks for Java, .NET Core, NodeJS, Go, Python, Ruby, Apache HTTPD, NGINX and Procfile. [More info](https://paketo.io/docs/reference/builders-reference/#available-paketo-builders). |

|	[Paketo](https://hub.docker.com/r/paketobuildpacks/builder) (_full_) | `docker.io/paketobuildpacks/builder-jammy-full:latest`  | Ubuntu Jammy (22.04) base image with buildpacks for Java, .NET Core, NodeJS, Go, Python, PHP, Ruby, Apache HTTPD, NGINX and Procfile. [More info](https://paketo.io/docs/reference/builders-reference/#available-paketo-builders). |

|	[Paketo](https://hub.docker.com/r/paketobuildpacks/builder) (_tiny_) | `paketobuildpacks/builder-jammy-tiny:latest`  | Tiny base image (Ubuntu Jammy (22.04) build image, distroless-like run image) with buildpacks for Java, Java Native Image and Go. [More info](https://paketo.io/docs/reference/builders-reference/#available-paketo-builders). |

<!--

|	[CloudFoundry](https://hub.docker.com/r/cloudfoundry/cnb) (_base_) | `cloudfoundry/cnb:base`  | A minimal image based on Ubuntu, with the addition of a few packages - notably, git and build-essentials (added in order to successfully run go applications) |

|	[CloudFoundry](https://hub.docker.com/r/cloudfoundry/cnb) (_full_) | `cloudfoundry/cnb:full`  | An image based on Ubuntu supplemented with additional packages |
@@ -214,7 +214,7 @@ It is bound to the `package-test` stage, and uses the following variables: 


| Input / Variable | Description                            | Default value     |

| ---------------------- | -------------------------------------- | ----------------- |

| `trivy-image` / `CNB_TRIVY_IMAGE` | The docker image used to scan images with Trivy | `registry.hub.docker.com/aquasec/trivy:latest` |

| `trivy-image` / `CNB_TRIVY_IMAGE` | The docker image used to scan images with Trivy | `docker.io/aquasec/trivy:latest` |

| `trivy-disabled` / `CNB_TRIVY_DISABLED` | Set to `true` to disable Trivy analysis          | _(none)_ |

| `trivy-args` / `CNB_TRIVY_ARGS` | Additional [`trivy image` options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_image/#options) | `--ignore-unfixed --vuln-type os` |

kicker.json

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    {

      "name": "CNB_BUILDER_IMAGE",

      "description": "The CNB builder image used to build your application image\n\n_depending on your needs, [choose the most appropriate one](https://paketo.io/docs/concepts/builders/#what-paketo-builders-are-available)_",

      "default": "registry.hub.docker.com/paketobuildpacks/builder:base"

      "default": "docker.io/paketobuildpacks/builder-jammy-base:latest"

    },

    {

      "name": "CNB_APP_DIR",
@@ -50,7 +50,7 @@ 
        {

          "name": "CNB_TRIVY_IMAGE",

          "description": "The docker image used to scan images with Trivy",

          "default": "registry.hub.docker.com/aquasec/trivy:latest",

          "default": "docker.io/aquasec/trivy:latest",

          "advanced": true

        },

        {

templates/gitlab-ci-cnb.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ spec: 
        The CNB builder image used to build your application image



        _depending on your needs, [choose the most appropriate one](https://paketo.io/docs/concepts/builders/#what-paketo-builders-are-available)_

      default: registry.hub.docker.com/paketobuildpacks/builder:base

      default: docker.io/paketobuildpacks/builder-jammy-base:latest

    app-dir:

      description: Absolute root directory in final image

      default: /workspace
@@ -56,7 +56,7 @@ spec: 
      default: false

    trivy-image:

      description: The docker image used to scan images with Trivy

      default: registry.hub.docker.com/aquasec/trivy:latest

      default: docker.io/aquasec/trivy:latest

    trivy-args:

      description: Additional [`trivy image` options](https://aquasecurity.github.io/trivy/latest/docs/references/configuration/cli/trivy_image/#options)

      default: --ignore-unfixed --vuln-type os --exit-on-eol 1