diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
| commit | c72e5ebe9938d315ec598197873e71a80168d40a (patch) | |
| tree | 439bf5c40aaf774e5a301825af517cb52726f450 /doc/ci/docker | |
| parent | ffc43b862df32a590eae874bcbb11109b46dc8be (diff) | |
| download | gitlab-ce-c72e5ebe9938d315ec598197873e71a80168d40a.tar.gz | |
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 08419685388..777174eb280 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -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. -Docker, when used with GitLab CI, runs each job in a separate and isolated +When used with GitLab CI, 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). @@ -588,7 +588,7 @@ There are two ways to determine the value of `DOCKER_AUTH_CONFIG`: # Example output to copy bXlfdXNlcm5hbWU6bXlfcGFzc3dvcmQ= ``` - + Create the Docker JSON configuration content as follows: ```json |