diff --git a/CHANGELOG.md b/CHANGELOG.md index 3306ffb0266e3dafe2c4c942947ff929ff01b134..ec627fb148b5175c94b23fbff0e4c1ee286bbe7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.2.0](https://gitlab.com/to-be-continuous/docker/compare/2.1.2...2.2.0) (2021-11-24) + + +### Features + +* add configurable metadata variable with OCI recommended labels ([d3630f9](https://gitlab.com/to-be-continuous/docker/commit/d3630f9356ba3c9934f972ca728f562e3d015019)) + ## [2.1.2](https://gitlab.com/to-be-continuous/docker/compare/2.1.1...2.1.2) (2021-10-19) diff --git a/README.md b/README.md index d73d94ee40b2975e5651511a7db1f83386e7c79c..fd93081a7745364b868126de8d03530d6158bbdc 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `.g ```yaml include: - project: 'to-be-continuous/docker' - ref: '2.1.2' + ref: '2.2.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -330,7 +330,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '2.1.2' + ref: '2.2.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -348,7 +348,7 @@ Here is a `.gitlab-ci.yaml` that builds 2 Docker images from the same project (u ```yaml include: - project: 'to-be-continuous/docker' - ref: '2.1.2' + ref: '2.2.0' file: '/templates/gitlab-ci-docker.yml' variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index fb970685f6078eecbcfe546f237a71153e2b40b1..4a5853ef96d8d41a7b0f67999ac2c820f73f844a 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -376,7 +376,7 @@ stages: fi } - if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.1.2"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.2.0"; fi init_workspace # ENDSCRIPT @@ -384,7 +384,7 @@ stages: .docker-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.1.2"] + command: ["--service", "docker", "2.2.0"] before_script: - *docker-scripts @@ -413,7 +413,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "2.1.2"] + command: ["--service", "docker", "2.2.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: