diff options
| author | Steve Azzopardi <sazzopardi@gitlab.com> | 2019-07-23 08:21:48 +0000 |
|---|---|---|
| committer | Steve Azzopardi <sazzopardi@gitlab.com> | 2019-07-23 08:21:48 +0000 |
| commit | 222cd6ef46e04c70cabc9a5bcbb93449d5e7f2c0 (patch) | |
| tree | 18bc3bdf8ad8bc5be7b997326ec6d2b5f3764747 | |
| parent | Merge branch 'docs/update-default-shell-for-windows' into 'master' (diff) | |
| parent | Further clarify Docker requirements (diff) | |
| download | gitlab-runner-222cd6ef46e04c70cabc9a5bcbb93449d5e7f2c0.tar.gz | |
Merge branch 'docs/further-update-min-docker-version' into 'master'
Further clarify Docker requirements
See merge request gitlab-org/gitlab-runner!1486
| -rw-r--r-- | docs/executors/docker.md | 6 | ||||
| -rw-r--r-- | docs/index.md | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/executors/docker.md b/docs/executors/docker.md index 1b4173ee..5fade67d 100644 --- a/docs/executors/docker.md +++ b/docs/executors/docker.md @@ -30,9 +30,9 @@ and OS are supported. NOTE: **Note:** GitLab Runner uses Docker Engine API [v1.25](https://docs.docker.com/engine/api/v1.25/) to talk to the Docker -Engine. Refer to the [API version -matrix](https://docs.docker.com/develop/sdk/#api-version-matrix) for -compatible versions of Docker. +Engine. This means means the +[minimum supported version](https://docs.docker.com/develop/sdk/#api-version-matrix) +of Docker is `1.13.0`. ## Using Windows containers diff --git a/docs/index.md b/docs/index.md index e626b383..0efb2c06 100644 --- a/docs/index.md +++ b/docs/index.md @@ -19,8 +19,8 @@ It is designed to run on the GNU/Linux, macOS, and Windows operating systems. Other operating systems will probably work as long as you can compile a Go binary on them. -If you want to use Docker make sure that you have at least version `v1.13.0` -installed. +If you want to [use Docker](executors/docker.md), install the latest version. +GitLab Runner requires a minimum of Docker `v1.13.0`. ## Features |