From fee8583f4a55d9b819f8026c6266028a5bf69569 Mon Sep 17 00:00:00 2001 From: semantic-release-bot <semantic-release-bot@martynus.net> Date: Wed, 28 Sep 2022 16:06:12 +0000 Subject: [PATCH] chore(release): 3.1.1 [skip ci] ## [3.1.1](https://gitlab.com/to-be-continuous/docker/compare/3.1.0...3.1.1) (2022-09-28) ### Bug Fixes * support DOCKER_XX_IMAGE with registry port ([54e9e05](https://gitlab.com/to-be-continuous/docker/commit/54e9e05f810b8abb81440cba7dd8ebd7e89644a9)) --- CHANGELOG.md | 7 +++++++ README.md | 10 +++++----- templates/gitlab-ci-docker-vault.yml | 2 +- templates/gitlab-ci-docker.yml | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecbe87b..8549f6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [3.1.1](https://gitlab.com/to-be-continuous/docker/compare/3.1.0...3.1.1) (2022-09-28) + + +### Bug Fixes + +* support DOCKER_XX_IMAGE with registry port ([54e9e05](https://gitlab.com/to-be-continuous/docker/commit/54e9e05f810b8abb81440cba7dd8ebd7e89644a9)) + # [3.1.0](https://gitlab.com/to-be-continuous/docker/compare/3.0.0...3.1.0) (2022-09-20) diff --git a/README.md b/README.md index 77cc0ae..dc47712 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: '3.1.0' + ref: '3.1.1' file: '/templates/gitlab-ci-docker.yml' ``` @@ -423,7 +423,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '3.1.0' + ref: '3.1.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -441,7 +441,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: '3.1.0' + ref: '3.1.1' file: '/templates/gitlab-ci-docker.yml' variables: @@ -497,11 +497,11 @@ With: include: # main template - project: 'to-be-continuous/docker' - ref: '3.1.0' + ref: '3.1.1' file: '/templates/gitlab-ci-docker.yml' # Vault variant - project: 'to-be-continuous/docker' - ref: '3.1.0' + ref: '3.1.1' file: '/templates/gitlab-ci-docker-vault.yml' variables: diff --git a/templates/gitlab-ci-docker-vault.yml b/templates/gitlab-ci-docker-vault.yml index 3799fa0..d6b50e4 100644 --- a/templates/gitlab-ci-docker-vault.yml +++ b/templates/gitlab-ci-docker-vault.yml @@ -9,6 +9,6 @@ variables: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.1.0"] + command: ["--service", "docker", "3.1.1"] - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master" alias: "vault-secrets-provider" diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index 600b50a..63f04c7 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -408,7 +408,7 @@ stages: .docker-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.1.0"] + command: ["--service", "docker", "3.1.1"] before_script: - *docker-scripts @@ -437,7 +437,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker", "3.1.0"] + command: ["--service", "docker", "3.1.1"] - name: $DOCKER_DIND_IMAGE alias: docker command: -- GitLab