Skip to content
Snippets Groups Projects
Commit 8d581b1c authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

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

Resolve "Add registry name in all Docker images"

Closes #34

See merge request to-be-continuous/helm!56
parents 096d75d4 bf44e5e2
No related branches found
No related tags found
No related merge requests found
......@@ -206,7 +206,7 @@ The Helm template uses some global configuration used throughout all jobs.
| Name | description | default value |
| --------------------- | -------------------------------------- | ----------------- |
| `HELM_CLI_IMAGE` | The Docker image used to run Helm <br/>:warning: **set the version required by your Kubernetes server** | `alpine/helm:latest` |
| `HELM_CLI_IMAGE` | The Docker image used to run Helm <br/>:warning: **set the version required by your Kubernetes server** | `registry.hub.docker.com/alpine/helm:latest` |
| `HELM_CHART_DIR` | The folder where the Helm chart is located | `.` _(root project dir)_ |
| `HELM_SCRIPTS_DIR` | The folder where hook scripts are located | `.` _(root project dir)_ |
| `HELM_COMMON_VALUES` | Common values file (used for all environments, overridden by specific per-env values files) | undefined (none) |
......@@ -306,7 +306,7 @@ These jobs perform a [Yaml Lint](https://github.com/adrienverge/yamllint) of you
| Name | description | default value |
| ------------------------ | ------------------------------------- | ----------------- |
| `HELM_YAMLLINT_IMAGE` | The Docker image used to run YamlLint test | `cytopia/yamllint` |
| `HELM_YAMLLINT_IMAGE` | The Docker image used to run YamlLint test | `registry.hub.docker.com/cytopia/yamllint` |
| `HELM_YAMLLINT_DISABLED` | Set to `true` to disable Yaml lint | _none_ (enabled) |
| `HELM_YAMLLINT_CONFIG` | Config used with the yamllint tool | `{extends: relaxed, rules: {line-length: {max: 160}}}` |
| `HELM_YAMLLINT_ARGS` | Arguments used by the lint job | `-f colored --strict` |
......
......@@ -7,7 +7,7 @@
{
"name": "HELM_CLI_IMAGE",
"description": "The Docker image used to run Helm - **set the version required by your Kubernetes server**",
"default": "alpine/helm:latest"
"default": "registry.hub.docker.com/alpine/helm:latest"
},
{
"name": "HELM_CHART_DIR",
......@@ -122,7 +122,7 @@
{
"name": "HELM_YAMLLINT_IMAGE",
"description": "The Docker image used to run YamlLint test",
"default": "cytopia/yamllint"
"default": "registry.hub.docker.com/cytopia/yamllint"
},
{
"name": "HELM_YAMLLINT_CONFIG",
......
......@@ -45,8 +45,8 @@ variables:
TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
# Docker Image with Helm CLI tool (can be overridden)
HELM_CLI_IMAGE: "alpine/helm"
HELM_YAMLLINT_IMAGE: "cytopia/yamllint"
HELM_CLI_IMAGE: "registry.hub.docker.com/alpine/helm"
HELM_YAMLLINT_IMAGE: "registry.hub.docker.com/cytopia/yamllint"
# HELM_LINT_DISABLED: "true"
# HELM_YAMLLINT_DISABLED: "true"
HELM_YAMLLINT_CONFIG: "{extends: relaxed, rules: {line-length: {max: 160}}}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment