diff options
author | Evan Read <eread@gitlab.com> | 2019-07-16 09:24:32 +0300 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-07-16 09:24:32 +0300 |
commit | 2cefaaa24fc362f9f4e71f0e4c77a3e50685f5dc (patch) | |
tree | 036532310e2f552e098f39702748012b83093f74 /doc/ci/docker | |
parent | 9fe1cdf7bd041005c629fae4517b64004e8c03bb (diff) | |
parent | feae50ffdf35fb1362055af9d9f3d457693ca6ba (diff) |
Merge branch 'add-default-docs' into 'master'
Add usage of `default:`
Closes #63351
See merge request gitlab-org/gitlab-ce!30677
Diffstat (limited to 'doc/ci/docker')
-rw-r--r-- | doc/ci/docker/using_docker_images.md | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 90565efe196..83a9035c001 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -193,13 +193,14 @@ You can simply define an image that will be used for all jobs and a list of services that you want to use during build time: ```yaml -image: ruby:2.2 +default: + image: ruby:2.2 -services: - - postgres:9.3 + services: + - postgres:9.3 -before_script: - - bundle install + before_script: + - bundle install test: script: @@ -209,8 +210,9 @@ test: It is also possible to define different images and services per job: ```yaml -before_script: - - bundle install +default: + before_script: + - bundle install test:2.1: image: ruby:2.1 @@ -231,18 +233,19 @@ Or you can pass some [extended configuration options](#extended-docker-configura for `image` and `services`: ```yaml -image: - name: ruby:2.2 - entrypoint: ["/bin/bash"] +default: + image: + name: ruby:2.2 + entrypoint: ["/bin/bash"] -services: -- name: my-postgres:9.4 - alias: db-postgres - entrypoint: ["/usr/local/bin/db-postgres"] - command: ["start"] + services: + - name: my-postgres:9.4 + alias: db-postgres + entrypoint: ["/usr/local/bin/db-postgres"] + command: ["start"] -before_script: -- bundle install + before_script: + - bundle install test: script: |