Commit b5594209 authored by semantic-release-bot's avatar semantic-release-bot
Browse files
parent fc9a1adc
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ In order to include this template in your project, add the following to your `.g
```yaml
include:
  - project: 'Orange-OpenSource/tbc/docker'
    ref: '1.0.0'
    ref: '1.1.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: 'Orange-OpenSource/tbc/docker'
    ref: '1.0.0'
    ref: '1.1.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: 'Orange-OpenSource/tbc/docker'
    ref: '1.0.0'
    ref: '1.1.0'
    file: '/templates/gitlab-ci-docker.yml'

variables:
+3 −3
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ stages:
    fi
  }

  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update docker "1.0.0"; fi
  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update docker "1.1.0"; fi
  init_workspace

  # ENDSCRIPT
@@ -366,7 +366,7 @@ stages:
.docker-base:
  services:
    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"
      command: ["--service", "docker", "1.0.0"]
      command: ["--service", "docker", "1.1.0"]
  before_script:
    - *docker-scripts

@@ -395,7 +395,7 @@ stages:
    _TRACE: "${TRACE}"
  services:
    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"
      command: ["--service", "docker", "1.0.0"]
      command: ["--service", "docker", "1.1.0"]
    - name: $DOCKER_DIND_IMAGE
      alias: docker
      command: