Commit 2d924e0a authored by Bertrand Goareguer's avatar Bertrand Goareguer Committed by Cédric OLIVIER
Browse files

fix: Add registry name in all Docker images

parent b94263fd

README.md

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ This template can be configured with the following **environment variables**: 


| Name                            | Description                                                                          | Default value                                  |

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

| `ANSIBLE_IMAGE`                 | The Docker image used to run Ansible. The image may contain your Ansible sources. <br/>:warning: **set the version required by your project** | `cytopia/ansible:latest-tools` |

| `ANSIBLE_IMAGE`                 | The Docker image used to run Ansible. The image may contain your Ansible sources. <br/>:warning: **set the version required by your project** | `registry.hub.docker.com/cytopia/ansible:latest-tools` |

| `ANSIBLE_PROJECT_DIR`           | Ansible project root directory                                                       | `.`                                            |

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

| `ANSIBLE_ENVIRONMENT_URL`       | Default environments url _(only define for static environment URLs declaration)_<br/>_supports late variable expansion (ex: `https://%{environment_name}.acme.com`)_ | _none_ |
@@ -344,7 +344,7 @@ Here are its parameters: 


| Name                    | Description                               | Default value                 |

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

| `ANSIBLE_LINT_IMAGE`    | The Docker image used to run Ansible Lint | `haxorof/ansible-lint:latest` |

| `ANSIBLE_LINT_IMAGE`    | The Docker image used to run Ansible Lint | `registry.hub.docker.com/haxorof/ansible-lint:latest` |

| `ANSIBLE_LINT_DISABLED` | Set to `true` to disable the `ansible lint` analysis  | _none_ (enabled) |



In addition to a textual report in the console, this job produces the following report, kept for one day:

kicker.json

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

      "name": "ANSIBLE_IMAGE",

      "description": "The Docker image used to run Ansible. The image may contain your Ansible sources. **set the version required by your project**",

      "default": "cytopia/ansible:latest-tools"

      "default": "registry.hub.docker.com/cytopia/ansible:latest-tools"

    },

    {

      "name": "ANSIBLE_PROJECT_DIR",
@@ -97,7 +97,7 @@ 
        {

          "name": "ANSIBLE_LINT_IMAGE",

          "description": "The Docker image used to run Ansible Lint.",

          "default": "haxorof/ansible-lint:latest"

          "default": "registry.hub.docker.com/haxorof/ansible-lint:latest"

        }

      ]

    },

templates/gitlab-ci-ansible.yml

+2 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ variables: 
  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  # Docker Image with Ansible

  ANSIBLE_IMAGE: "cytopia/ansible:latest-tools"

  ANSIBLE_IMAGE: "registry.hub.docker.com/cytopia/ansible:latest-tools"

  ANSIBLE_BASE_APP_NAME: "$CI_PROJECT_NAME"

  ANSIBLE_PROJECT_DIR: "."

  ANSIBLE_LINT_IMAGE: "haxorof/ansible-lint:latest"

  ANSIBLE_LINT_IMAGE: "registry.hub.docker.com/haxorof/ansible-lint:latest"

  ANSIBLE_FORCE_COLOR: "true"

  ANSIBLE_REQUIREMENTS_FILE: "requirements.yml"

  ANSIBLE_SCRIPTS_DIR: "."