Skip to content

G
gitlab-ce
Commit cc8a18a8 authored by Evan Read's avatar Evan Read
Browse files
Options

Merge branch 'docs-update-docker-version' into 'master' 

Update docker version in docs

See merge request gitlab-org/gitlab!29429
parents d57f74ea 09cfba50
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
doc/ci/docker/using_docker_build.md
View file @ cc8a18a8
...@@ -120,7 +120,7 @@ not without its own challenges: ...@@ -120,7 +120,7 @@ not without its own challenges:
- By default, Docker 17.09 and higher uses `--storage-driver overlay2` which is - By default, Docker 17.09 and higher uses `--storage-driver overlay2` which is
the recommended storage driver. See [Using the overlayfs driver](#using-the-overlayfs-driver) the recommended storage driver. See [Using the overlayfs driver](#using-the-overlayfs-driver)
for details. for details.
- Since the `docker:19.03.1-dind` container and the Runner container don't share their - Since the `docker:19.03.8-dind` container and the Runner container don't share their
root filesystem, the job's working directory can be used as a mount point for root filesystem, the job's working directory can be used as a mount point for
child containers. For example, if you have files you want to share with a child containers. For example, if you have files you want to share with a
child container, you may create a subdirectory under `/builds/$CI_PROJECT_PATH` child container, you may create a subdirectory under `/builds/$CI_PROJECT_PATH`
...@@ -139,7 +139,7 @@ not without its own challenges: ...@@ -139,7 +139,7 @@ not without its own challenges:
An example project using this approach can be found here: <https://gitlab.com/gitlab-examples/docker>. An example project using this approach can be found here: <https://gitlab.com/gitlab-examples/docker>.
In the examples below, we are using Docker images tags to specify a In the examples below, we are using Docker images tags to specify a
specific version, such as `docker:19.03.1`. If tags like `docker:stable` specific version, such as `docker:19.03.8`. If tags like `docker:stable`
are used, you have no control over what version is going to be used and this are used, you have no control over what version is going to be used and this
can lead to unpredictable behavior, especially when new versions are can lead to unpredictable behavior, especially when new versions are
released. released.
...@@ -150,7 +150,7 @@ NOTE: **Note** ...@@ -150,7 +150,7 @@ NOTE: **Note**
This requires GitLab Runner 11.11 or higher. This requires GitLab Runner 11.11 or higher.
The Docker daemon supports connection over TLS and it's done by default The Docker daemon supports connection over TLS and it's done by default
for Docker 19.03.1 or higher. This is the **suggested** way to use the for Docker 19.03.8 or higher. This is the **suggested** way to use the
docker-in-docker service and docker-in-docker service and
[GitLab.com Shared Runners](../../user/gitlab_com/index.md#shared-runners) [GitLab.com Shared Runners](../../user/gitlab_com/index.md#shared-runners)
support this. support this.
...@@ -166,13 +166,13 @@ support this. ...@@ -166,13 +166,13 @@ support this.
--registration-token REGISTRATION_TOKEN \ --registration-token REGISTRATION_TOKEN \
--executor docker \ --executor docker \
--description "My Docker Runner" \ --description "My Docker Runner" \
--docker-image "docker:19.03.1" \ --docker-image "docker:19.03.8" \
--docker-privileged \ --docker-privileged \
--docker-volumes "/certs/client" --docker-volumes "/certs/client"
``` ```
The above command will register a new Runner to use the special The above command will register a new Runner to use the special
`docker:19.03.1` image, which is provided by Docker. **Notice that it's `docker:19.03.8` image, which is provided by Docker. **Notice that it's
using the `privileged` mode to start the build and service using the `privileged` mode to start the build and service
containers.** If you want to use [docker-in-docker](https://www.docker.com/blog/docker-can-now-run-within-docker/) mode, you always containers.** If you want to use [docker-in-docker](https://www.docker.com/blog/docker-can-now-run-within-docker/) mode, you always
have to use `privileged = true` in your Docker containers. have to use `privileged = true` in your Docker containers.
...@@ -191,7 +191,7 @@ support this. ...@@ -191,7 +191,7 @@ support this.
executor = "docker" executor = "docker"
[runners.docker] [runners.docker]
tls_verify = false tls_verify = false
image = "docker:19.03.1" image = "docker:19.03.8"
privileged = true privileged = true
disable_cache = false disable_cache = false
volumes = ["/certs/client", "/cache"] volumes = ["/certs/client", "/cache"]
...@@ -201,18 +201,18 @@ support this. ...@@ -201,18 +201,18 @@ support this.
``` ```
1. You can now use `docker` in the build script (note the inclusion of the 1. You can now use `docker` in the build script (note the inclusion of the
`docker:19.03.1-dind` service): `docker:19.03.8-dind` service):
```yaml ```yaml
image: docker:19.03.1 image: docker:19.03.8
variables: variables:
# When using dind service, we need to instruct docker, to talk with # When using dind service, we need to instruct docker, to talk with
# the daemon started inside of the service. The daemon is available # the daemon started inside of the service. The daemon is available
# with a network connection instead of the default # with a network connection instead of the default
# /var/run/docker.sock socket. docker:19.03.1 does this automatically # /var/run/docker.sock socket. Docker 19.03 does this automatically
# by setting the DOCKER_HOST in # by setting the DOCKER_HOST in
# https://github.com/docker-library/docker/blob/d45051476babc297257df490d22cbd806f1b11e4/19.03.1/docker-entrypoint.sh#L23-L29 # https://github.com/docker-library/docker/blob/d45051476babc297257df490d22cbd806f1b11e4/19.03/docker-entrypoint.sh#L23-L29
# #
# The 'docker' hostname is the alias of the service container as described at # The 'docker' hostname is the alias of the service container as described at
# https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services. # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services.
...@@ -229,7 +229,7 @@ support this. ...@@ -229,7 +229,7 @@ support this.
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
before_script: before_script:
- docker info - docker info
...@@ -256,7 +256,7 @@ Assuming that the Runner `config.toml` is similar to: ...@@ -256,7 +256,7 @@ Assuming that the Runner `config.toml` is similar to:
executor = "docker" executor = "docker"
[runners.docker] [runners.docker]
tls_verify = false tls_verify = false
image = "docker:19.03.1" image = "docker:19.03.8"
privileged = true privileged = true
disable_cache = false disable_cache = false
volumes = ["/cache"] volumes = ["/cache"]
...@@ -266,10 +266,10 @@ Assuming that the Runner `config.toml` is similar to: ...@@ -266,10 +266,10 @@ Assuming that the Runner `config.toml` is similar to:
``` ```
You can now use `docker` in the build script (note the inclusion of the You can now use `docker` in the build script (note the inclusion of the
`docker:19.03.1-dind` service): `docker:19.03.8-dind` service):
```yaml ```yaml
image: docker:19.03.1 image: docker:19.03.8
variables: variables:
# When using dind service we need to instruct docker, to talk with the # When using dind service we need to instruct docker, to talk with the
...@@ -290,7 +290,7 @@ variables: ...@@ -290,7 +290,7 @@ variables:
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
before_script: before_script:
- docker info - docker info
...@@ -310,7 +310,7 @@ container so that Docker is available in the context of that image. ...@@ -310,7 +310,7 @@ container so that Docker is available in the context of that image.
NOTE: **Note:** NOTE: **Note:**
If you bind the Docker socket [when using GitLab Runner 11.11 or If you bind the Docker socket [when using GitLab Runner 11.11 or
newer](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1261), newer](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1261),
you can no longer use `docker:19.03.1-dind` as a service because volume bindings you can no longer use `docker:19.03.8-dind` as a service because volume bindings
are done to the services as well, making these incompatible. are done to the services as well, making these incompatible.
In order to do that, follow the steps: In order to do that, follow the steps:
...@@ -325,12 +325,12 @@ In order to do that, follow the steps: ...@@ -325,12 +325,12 @@ In order to do that, follow the steps:
--registration-token REGISTRATION_TOKEN \ --registration-token REGISTRATION_TOKEN \
--executor docker \ --executor docker \
--description "My Docker Runner" \ --description "My Docker Runner" \
--docker-image "docker:19.03.1" \ --docker-image "docker:19.03.8" \
--docker-volumes /var/run/docker.sock:/var/run/docker.sock --docker-volumes /var/run/docker.sock:/var/run/docker.sock
``` ```
The above command will register a new Runner to use the special The above command will register a new Runner to use the special
`docker:19.03.1` image which is provided by Docker. **Notice that it's using `docker:19.03.8` image which is provided by Docker. **Notice that it's using
the Docker daemon of the Runner itself, and any containers spawned by Docker the Docker daemon of the Runner itself, and any containers spawned by Docker
commands will be siblings of the Runner rather than children of the Runner.** commands will be siblings of the Runner rather than children of the Runner.**
This may have complications and limitations that are unsuitable for your workflow. This may have complications and limitations that are unsuitable for your workflow.
...@@ -344,7 +344,7 @@ In order to do that, follow the steps: ...@@ -344,7 +344,7 @@ In order to do that, follow the steps:
executor = "docker" executor = "docker"
[runners.docker] [runners.docker]
tls_verify = false tls_verify = false
image = "docker:19.03.1" image = "docker:19.03.8"
privileged = false privileged = false
disable_cache = false disable_cache = false
volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"] volumes = ["/var/run/docker.sock:/var/run/docker.sock", "/cache"]
...@@ -353,11 +353,11 @@ In order to do that, follow the steps: ...@@ -353,11 +353,11 @@ In order to do that, follow the steps:
``` ```
1. You can now use `docker` in the build script (note that you don't need to 1. You can now use `docker` in the build script (note that you don't need to
include the `docker:19.03.1-dind` service as when using the Docker in Docker include the `docker:19.03.8-dind` service as when using the Docker in Docker
executor): executor):
```yaml ```yaml
image: docker:19.03.1 image: docker:19.03.8
before_script: before_script:
- docker info - docker info
...@@ -411,10 +411,10 @@ any image that's used with the `--cache-from` argument must first be pulled ...@@ -411,10 +411,10 @@ any image that's used with the `--cache-from` argument must first be pulled
Here's a `.gitlab-ci.yml` file showing how Docker caching can be used: Here's a `.gitlab-ci.yml` file showing how Docker caching can be used:
```yaml ```yaml
image: docker:19.03.1 image: docker:19.03.8
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
variables: variables:
# Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
......
doc/user/application_security/container_scanning/index.md
View file @ cc8a18a8
...@@ -67,10 +67,10 @@ To enable Container Scanning in your pipeline, you need: ...@@ -67,10 +67,10 @@ To enable Container Scanning in your pipeline, you need:
```yaml ```yaml
build: build:
image: docker:19.03.1 image: docker:19.03.8
stage: build stage: build
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
variables: variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA IMAGE_TAG: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
script: script:
...@@ -118,7 +118,7 @@ variables: ...@@ -118,7 +118,7 @@ variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
services: services:
- docker:19.03.5-dind - docker:19.03.8-dind
stages: stages:
- build - build
...@@ -240,7 +240,7 @@ It may be worthwhile to set up a [scheduled pipeline](../../../ci/pipelines/sche ...@@ -240,7 +240,7 @@ It may be worthwhile to set up a [scheduled pipeline](../../../ci/pipelines/sche
image: docker:stable image: docker:stable
services: services:
- docker:19.03.5-dind - docker:19.03.8-dind
stages: stages:
- build - build
......
doc/user/application_security/dependency_scanning/index.md
View file @ cc8a18a8
...@@ -46,7 +46,7 @@ this is enabled by default. ...@@ -46,7 +46,7 @@ this is enabled by default.
CAUTION: **Caution:** CAUTION: **Caution:**
If you use your own Runners, make sure that the Docker version you have installed If you use your own Runners, make sure that the Docker version you have installed
is **not** `19.03.00`. See [troubleshooting information](#error-response-from-daemon-error-processing-tar-file-docker-tar-relocation-error) for details. is **not** `19.03.0`. See [troubleshooting information](#error-response-from-daemon-error-processing-tar-file-docker-tar-relocation-error) for details.
Privileged mode is not necessary if you've [disabled Docker in Docker for Dependency Scanning](#disabling-docker-in-docker-for-dependency-scanning) Privileged mode is not necessary if you've [disabled Docker in Docker for Dependency Scanning](#disabling-docker-in-docker-for-dependency-scanning)
...@@ -419,7 +419,7 @@ You can also [submit new vulnerabilities](https://gitlab.com/gitlab-org/security ...@@ -419,7 +419,7 @@ You can also [submit new vulnerabilities](https://gitlab.com/gitlab-org/security
### Error response from daemon: error processing tar file: docker-tar: relocation error ### Error response from daemon: error processing tar file: docker-tar: relocation error
This error occurs when the Docker version used to run the SAST job is `19.03.00`. This error occurs when the Docker version used to run the SAST job is `19.03.0`.
You are advised to update to Docker `19.03.01` or greater. Older versions are not You are advised to update to Docker `19.03.1` or greater. Older versions are not
affected. Read more in affected. Read more in
[this issue](https://gitlab.com/gitlab-org/gitlab/issues/13830#note_211354992 "Current SAST container fails"). [this issue](https://gitlab.com/gitlab-org/gitlab/issues/13830#note_211354992 "Current SAST container fails").
doc/user/application_security/sast/index.md
View file @ cc8a18a8
...@@ -58,7 +58,7 @@ CAUTION: **Caution:** Our SAST jobs currently expect a Linux container type. Win ...@@ -58,7 +58,7 @@ CAUTION: **Caution:** Our SAST jobs currently expect a Linux container type. Win
CAUTION: **Caution:** CAUTION: **Caution:**
If you use your own Runners, make sure that the Docker version you have installed If you use your own Runners, make sure that the Docker version you have installed
is **not** `19.03.00`. See [troubleshooting information](#error-response-from-daemon-error-processing-tar-file-docker-tar-relocation-error) for details. is **not** `19.03.0`. See [troubleshooting information](#error-response-from-daemon-error-processing-tar-file-docker-tar-relocation-error) for details.
## Supported languages and frameworks ## Supported languages and frameworks
...@@ -582,7 +582,7 @@ security reports without requiring internet access. ...@@ -582,7 +582,7 @@ security reports without requiring internet access.
### Error response from daemon: error processing tar file: docker-tar: relocation error ### Error response from daemon: error processing tar file: docker-tar: relocation error
This error occurs when the Docker version used to run the SAST job is `19.03.00`. This error occurs when the Docker version used to run the SAST job is `19.03.0`.
You are advised to update to Docker `19.03.01` or greater. Older versions are not You are advised to update to Docker `19.03.1` or greater. Older versions are not
affected. Read more in affected. Read more in
[this issue](https://gitlab.com/gitlab-org/gitlab/issues/13830#note_211354992 "Current SAST container fails"). [this issue](https://gitlab.com/gitlab-org/gitlab/issues/13830#note_211354992 "Current SAST container fails").
doc/user/packages/container_registry/index.md
View file @ cc8a18a8
...@@ -240,10 +240,10 @@ should look similar to this: ...@@ -240,10 +240,10 @@ should look similar to this:
```yaml ```yaml
build: build:
image: docker:19.03.1 image: docker:19.03.8
stage: build stage: build
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build -t $CI_REGISTRY/group/project/image:latest . - 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 ...@@ -254,10 +254,10 @@ You can also make use of [other variables](../../../ci/variables/README.md) to a
```yaml ```yaml
build: build:
image: docker:19.03.1 image: docker:19.03.8
stage: build stage: build
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
variables: variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
script: script:
...@@ -280,9 +280,9 @@ when needed. Changes to `master` also get tagged as `latest` and deployed using ...@@ -280,9 +280,9 @@ when needed. Changes to `master` also get tagged as `latest` and deployed using
an application-specific deploy script: an application-specific deploy script:
```yaml ```yaml
image: docker:19.03.1 image: docker:19.03.8
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
stages: stages:
- build - build
...@@ -355,9 +355,9 @@ Below is an example of what your `.gitlab-ci.yml` should look like: ...@@ -355,9 +355,9 @@ Below is an example of what your `.gitlab-ci.yml` should look like:
```yaml ```yaml
build: build:
image: $CI_REGISTRY/group/project/docker:19.03.1 image: $CI_REGISTRY/group/project/docker:19.03.8
services: services:
- name: $CI_REGISTRY/group/project/docker:19.03.1-dind - name: $CI_REGISTRY/group/project/docker:19.03.8-dind
alias: docker alias: docker
stage: build stage: build
script: script:
...@@ -365,7 +365,7 @@ Below is an example of what your `.gitlab-ci.yml` should look like: ...@@ -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 - 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: `dind` service, and an error like the following will be thrown:
```plaintext ```plaintext
...@@ -435,10 +435,10 @@ stages: ...@@ -435,10 +435,10 @@ stages:
- clean - clean
build_image: build_image:
image: docker:19.03.1 image: docker:19.03.8
stage: build stage: build
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
variables: variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
script: script:
...@@ -451,10 +451,10 @@ build_image: ...@@ -451,10 +451,10 @@ build_image:
- master - master
delete_image: delete_image:
image: docker:19.03.1 image: docker:19.03.8
stage: clean stage: clean
services: services:
- docker:19.03.1-dind - docker:19.03.8-dind
variables: variables:
IMAGE_TAG: $CI_PROJECT_PATH:$CI_COMMIT_REF_SLUG IMAGE_TAG: $CI_PROJECT_PATH:$CI_COMMIT_REF_SLUG
REG_SHA256: ade837fc5224acd8c34732bf54a94f579b47851cc6a7fd5899a98386b782e228 REG_SHA256: ade837fc5224acd8c34732bf54a94f579b47851cc6a7fd5899a98386b782e228
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7