Commit 54491ca9 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch '1-add-registry-name-in-all-docker-images' into 'master' 

Resolve "Add registry name in all Docker images"

Closes #1

See merge request to-be-continuous/cnb!13
parents 4b1a9eb1 14fba124

README.md

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ The CNB template uses some global configuration used throughout all jobs. 


| Name                  | description                            | default value     |

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

| `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)_ | `paketobuildpacks/builder:base` |

| `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` |

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



### Available Builders
@@ -32,10 +32,10 @@ Depending on your needs and preferences, you are free to choose whichever CNB co 
| Name                  | 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) | `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_) | `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_) | `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_) | `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) | `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 |

<!--

|	[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 |

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,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": "paketobuildpacks/builder:base"

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

    },

    {

      "name": "CNB_APP_DIR",

templates/gitlab-ci-cnb.yml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ variables: 
  # variabilized tracking image

  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  CNB_BUILDER_IMAGE: "paketobuildpacks/builder:base"

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

  CNB_SKOPEO_IMAGE: "quay.io/skopeo/stable:latest"



  # Default config uses the internal GitLab registry