diff --git a/README.md b/README.md index 7f7699137bb4b9cc9c459577849e5bb7d10c1e26..7e2b338055485f5369d1861592b4f621ae8e687f 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: '1.2.3' + ref: '2.0.0' file: '/templates/gitlab-ci-docker.yml' ``` @@ -307,7 +307,7 @@ Here is a `.gitlab-ci.yaml` using an external Docker registry: ```yaml include: - project: 'to-be-continuous/docker' - ref: '1.2.3' + ref: '2.0.0' file: '/templates/gitlab-ci-docker.yml' variables: @@ -325,7 +325,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: '1.2.3' + ref: '2.0.0' file: '/templates/gitlab-ci-docker.yml' variables: diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index ced43ec248b0ed348d53dc87bd9d5384730cdab9..fd1a44b5480e92aa5553a4851381b6d1fc479337 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -367,7 +367,7 @@ stages: fi } - if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "1.2.3"; fi + if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update docker "2.0.0"; fi init_workspace # ENDSCRIPT @@ -375,7 +375,7 @@ stages: .docker-base: services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "1.2.3"] + command: ["--service", "docker", "2.0.0"] before_script: - *docker-scripts @@ -404,7 +404,7 @@ stages: _TRACE: "${TRACE}" services: - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" - command: ["--service", "docker", "1.2.3"] + command: ["--service", "docker", "2.0.0"] - name: $DOCKER_DIND_IMAGE alias: docker command: