diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /doc/ci/quick_start | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'doc/ci/quick_start')
-rw-r--r-- | doc/ci/quick_start/index.md | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/doc/ci/quick_start/index.md b/doc/ci/quick_start/index.md index 711bf0c0e7a..664523a08e4 100644 --- a/doc/ci/quick_start/index.md +++ b/doc/ci/quick_start/index.md @@ -66,7 +66,7 @@ In this file, you define: - The decisions the runner should make when specific conditions are encountered. For example, you might want to run a suite of tests when you commit to -any branch except `master`. When you commit to `master`, you want +any branch except the default branch. When you commit to the default branch, you want to run the same suite, but also publish your application. All of this is defined in the `.gitlab-ci.yml` file. @@ -117,15 +117,22 @@ The pipeline starts when the commit is committed. #### `.gitlab-ci.yml` tips -- If you want the runner to use a Docker image to run the jobs, edit the `.gitlab-ci.yml` file - to include your image name: +- If you want the runner to [use a Docker container to run the jobs](../docker/using_docker_images.md), + edit the `.gitlab-ci.yml` file + to include an image name: ```yaml default: image: ruby:2.7.2 ``` - This command tells the runner to use a Ruby image from Docker Hub. + This command tells the runner to use a Ruby image from Docker Hub + and to run the jobs in a container that's generated from the image. + + This process is different than + [building an application as a Docker container](../docker/using_docker_build.md). + Your application does not need to be built as a Docker container to + run CI/CD jobs in Docker containers. - To validate your `.gitlab-ci.yml` file, use the [CI Lint tool](../lint.md), which is available in every project. |