diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 06:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 06:07:56 +0300 |
| commit | 4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (patch) | |
| tree | 4b70c6b61345b2df075918cab6314d41b46cf80e /doc/ci/docker | |
| parent | 6348b76e4b4dd4e398915c3150c1d02aafa3f13b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/docker')
| -rw-r--r-- | doc/ci/docker/using_docker_images.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 4beec62b36b..f56e7a161ca 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -4,7 +4,7 @@ type: concepts, howto # Using Docker images -GitLab CI in conjunction with [GitLab Runner](../runners/README.md) can use +GitLab CI/CD in conjunction with [GitLab Runner](../runners/README.md) can use [Docker Engine](https://www.docker.com/) to test and build any application. Docker is an open-source project that allows you to use predefined images to @@ -12,7 +12,7 @@ run applications in independent "containers" that are run within a single Linux instance. [Docker Hub][hub] has a rich database of pre-built images that can be used to test and build your applications. -When used with GitLab CI, Docker runs each job in a separate and isolated +When used with GitLab CI/CD, Docker runs each job in a separate and isolated container using the predefined image that is set up in [`.gitlab-ci.yml`](../yaml/README.md). |