Commit 45a5843a authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

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

Resolve "Add registry name in all Docker images"

Closes #14

See merge request to-be-continuous/s3!36
parents c975ad0a 00c2ddb3

README.md

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


| Name                   | description                                   | default value     |

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

| `S3_CMD_IMAGE`         | The Docker image used to run [s3cmd](https://s3tools.org/usage) commands | `d3fk/s3cmd:latest` |

| `S3_CMD_IMAGE`         | The Docker image used to run [s3cmd](https://s3tools.org/usage) commands | `registry.hub.docker.com/d3fk/s3cmd:latest` |

| `S3_ENDPOINT_HOST`     | Default S3 endpoint hostname (with port)      | `s3.amazonaws.com` (AWS) |

| `S3_HOST_BUCKET`       | Default DNS-style bucket+hostname:port template for accessing a bucket | `%(bucket)s.$S3_ENDPOINT_HOST` |

| `S3_REGION`            | Default region to create the buckets in (if not defined, the template won't create any) | _none_ |

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
      "name": "S3_CMD_IMAGE",

      "description": "The Docker image used to run [s3cmd](https://s3tools.org/usage) commands",

      "advanced": true,

      "default": "d3fk/s3cmd:latest"

      "default": "registry.hub.docker.com/d3fk/s3cmd:latest"

    },

    {

      "name": "S3_ENDPOINT_HOST",

templates/gitlab-ci-s3.yml

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

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



  S3_CMD_IMAGE: "d3fk/s3cmd:latest"

  S3_CMD_IMAGE: "registry.hub.docker.com/d3fk/s3cmd:latest"

  # defaults to AWS

  S3_ENDPOINT_HOST: "s3.amazonaws.com"

  S3_HOST_BUCKET: "%(bucket)s.$S3_ENDPOINT_HOST"