Commit 963477ee authored by Evan Read's avatar Evan Read

Merge branch 'docs/update-docker-description' into 'master'

Update docs for docker executor description

See merge request gitlab-org/gitlab-runner!1358
parents 6dabc14a 5a84e03d
......@@ -156,7 +156,7 @@ There are a couple of available executors currently.
| Executor | Description |
| -------- | ----------- |
| `shell` | run build locally, default |
| `docker` | run build using Docker container - this requires the presence of `[runners.docker]` and [Docker Engine][] installed on the system that the Runner runs |
| `docker` | run build using Docker container. This requires the presence of `[runners.docker]` and [Docker Engine][] installed on a system that the Runner will run the job on. |
| `docker-windows` | run build using Windows Docker container. This requires the presence of `[runners.docker]` and [Docker Engine][] installed on a Windows system. |
| `docker-ssh` | run build using Docker container, but connect to it with SSH - this requires the presence of `[runners.docker]` , `[runners.ssh]` and [Docker Engine][] installed on the system that the Runner runs. **Note: This will run the docker container on the local machine, it just changes how the commands are run inside that container. If you want to run docker commands on an external machine, then you should change the `host` parameter in the `runners.docker` section.**|
| `ssh` | run build remotely with SSH - this requires the presence of `[runners.ssh]` |
......
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