Commit 6b86cc3a authored by Bertrand Goareguer's avatar Bertrand Goareguer Committed by Cédric OLIVIER
Browse files

Resolve "Add registry name in all Docker images"

parent 5e589d92

README.md

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ The AWS template uses some global configuration used throughout all jobs and env 


| Name                     | description                            | default value     |

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

| `AWS_CLI_IMAGE`          | the Docker image used to run AWS CLI commands| `amazon/aws-cli:latest` |

| `AWS_CLI_IMAGE`          | the Docker image used to run AWS CLI commands| `registry.hub.docker.com/amazon/aws-cli:latest` |

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

| `AWS_ENVIRONMENT_URL`    | Default environments url _(only define for static environment URLs declaration)_<br/>_supports late variable expansion (ex: `https://%{environment_name}.aws.acme.com`)_ | _none_ |

| `AWS_SCRIPTS_DIR`        | Directory where AWS scripts (deploy & cleanup) are located | `.` _(root project dir)_ |

kicker.json

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

      "name": "AWS_CLI_IMAGE",

      "description": "The Docker image used to run AWS CLI commands",

      "default": "amazon/aws-cli:latest"

      "default": "registry.hub.docker.com/amazon/aws-cli:latest"

    },

    {

      "name": "AWS_BASE_APP_NAME",

templates/gitlab-ci-aws.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"



  # Default Docker image (can be overridden)

  AWS_CLI_IMAGE: "amazon/aws-cli:latest"

  AWS_CLI_IMAGE: "registry.hub.docker.com/amazon/aws-cli:latest"



  AWS_SCRIPTS_DIR: "."