diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:40:32 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:40:32 +0100 |
| commit | 926c3bef9fbda49d5cab268bcd83355142e945c1 (patch) | |
| tree | 1dc2b7eb13485f0fc656cc913ca56e57b672b62a /doc/ci | |
| parent | 1a10945066d0da1801bb4cf89ce5f54996f1756f (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-reference-pipeline-and-caching.tar.gz | |
Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/docker/using_docker_images.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 64e52eba3a2..1feae62b1c7 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -190,7 +190,7 @@ This will create two service containers (MySQL and PostgreSQL). 1. Create a build container and execute script in its context: ``` -$ cat build_script | docker run -n build -i -l mysql:service-mysql -l postgres:service-postgres ruby:2.1 /bin/bash +$ docker run --name build -i --link=service-mysql:mysql --link=service-postgres:postgres ruby:2.1 /bin/bash < build_script ``` This will create build container that has two service containers linked. The build_script is piped using STDIN to bash interpreter which executes the build script in container. |