summaryrefslogtreecommitdiff
path: root/doc/user/packages
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-15 00:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-15 00:09:27 +0000
commit30a8d158a29cc09ece1a71771a28f7bc1483506b (patch)
tree223fab9858e274fff5e901116890d2d7c8ad162b /doc/user/packages
parentae93b284016c07a8a4b47e2510789253d14870f3 (diff)
downloadgitlab-ce-30a8d158a29cc09ece1a71771a28f7bc1483506b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/packages')
-rw-r--r--doc/user/packages/container_registry/index.md26
1 files changed, 13 insertions, 13 deletions
diff --git a/doc/user/packages/container_registry/index.md b/doc/user/packages/container_registry/index.md
index d6c6767a8fd..5505a4503ca 100644
--- a/doc/user/packages/container_registry/index.md
+++ b/doc/user/packages/container_registry/index.md
@@ -240,10 +240,10 @@ should look similar to this:
```yaml
build:
- image: docker:19.03.1
+ image: docker:19.03.8
stage: build
services:
- - docker:19.03.1-dind
+ - docker:19.03.8-dind
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build -t $CI_REGISTRY/group/project/image:latest .
@@ -254,10 +254,10 @@ You can also make use of [other variables](../../../ci/variables/README.md) to a
```yaml
build:
- image: docker:19.03.1
+ image: docker:19.03.8
stage: build
services:
- - docker:19.03.1-dind
+ - docker:19.03.8-dind
variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
script:
@@ -280,9 +280,9 @@ when needed. Changes to `master` also get tagged as `latest` and deployed using
an application-specific deploy script:
```yaml
-image: docker:19.03.1
+image: docker:19.03.8
services:
- - docker:19.03.1-dind
+ - docker:19.03.8-dind
stages:
- build
@@ -355,9 +355,9 @@ Below is an example of what your `.gitlab-ci.yml` should look like:
```yaml
build:
- image: $CI_REGISTRY/group/project/docker:19.03.1
+ image: $CI_REGISTRY/group/project/docker:19.03.8
services:
- - name: $CI_REGISTRY/group/project/docker:19.03.1-dind
+ - name: $CI_REGISTRY/group/project/docker:19.03.8-dind
alias: docker
stage: build
script:
@@ -365,7 +365,7 @@ Below is an example of what your `.gitlab-ci.yml` should look like:
- docker run my-docker-image /script/to/run/tests
```
-If you forget to set the service alias, the `docker:19.03.1` image won't find the
+If you forget to set the service alias, the `docker:19.03.8` image won't find the
`dind` service, and an error like the following will be thrown:
```plaintext
@@ -435,10 +435,10 @@ stages:
- clean
build_image:
- image: docker:19.03.1
+ image: docker:19.03.8
stage: build
services:
- - docker:19.03.1-dind
+ - docker:19.03.8-dind
variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
script:
@@ -451,10 +451,10 @@ build_image:
- master
delete_image:
- image: docker:19.03.1
+ image: docker:19.03.8
stage: clean
services:
- - docker:19.03.1-dind
+ - docker:19.03.8-dind
variables:
IMAGE_TAG: $CI_PROJECT_PATH:$CI_COMMIT_REF_SLUG
REG_SHA256: ade837fc5224acd8c34732bf54a94f579b47851cc6a7fd5899a98386b782e228