Commit 23edeeb7 authored by Bertrand Goareguer's avatar Bertrand Goareguer Committed by Cédric OLIVIER
Browse files

fix: "Add registry name in all Docker images"

parent 9eaa93cc

README.md

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ The OpenShift template uses some global configuration used throughout all jobs. 


| Name                     | description                            | default value     |

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

| `OS_CLI_IMAGE`           | the Docker image used to run OpenShift Client (OC) CLI commands <br/>:warning: **set the version required by your OpenShift server** | `openshift/origin-cli:latest` |

| `OS_CLI_IMAGE`           | the Docker image used to run OpenShift Client (OC) CLI commands <br/>:warning: **set the version required by your OpenShift server** | `quay.io/openshift/origin-cli:latest` |

| `OS_URL`                 | Default OpenShift API url              | **has to be defined** |

| :lock: `OS_TOKEN`        | Default OpenShift API [token](#supported-authentication-methods) | **has to be defined** |

| `OS_BASE_APP_NAME`       | Base application name                  | `$CI_PROJECT_NAME` ([see GitLab doc](https://docs.gitlab.com/ee/ci/variables/predefined_variables.html)) |

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    {

      "name": "OS_CLI_IMAGE",

      "description": "the Docker image used to run OpenShift Client (OC) CLI commands - **set the version required by your OpenShift server**",

      "default": "openshift/origin-cli:latest"

      "default": "quay.io/openshift/origin-cli:latest"

    },

    {

      "name": "OS_URL",

templates/gitlab-ci-openshift.yml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ variables: 
  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  # Docker Image with OC CLI tool (can be overridden)

  OS_CLI_IMAGE: "openshift/origin-cli:latest"

  OS_CLI_IMAGE: "quay.io/openshift/origin-cli:latest"



  # [mandatory] OS_URL              : the OpenShift API url

  # [mandatory] OS_TOKEN            : the OpenShift authentication token