diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-12-07 16:21:56 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-12-07 16:21:56 +0000 |
commit | 24c7eafb295a292ed5eb166688d638f7d3278261 (patch) | |
tree | c5015889f2bb5df200a0f078969eb5932e030ef7 | |
parent | bd5fb1b479f29df3c2150b6c375c1b7bffd28931 (diff) | |
parent | 8a0507d523293289ae4b7d61bb3fce8a873e3dcc (diff) | |
download | gitlab-ce-24c7eafb295a292ed5eb166688d638f7d3278261.tar.gz |
Merge branch 'fix-docker-syntax' into 'master'
Update Docker Syntax
I think this documentation is using an out-of-date docker client. I guess that `-n` means `--name` (there is no `-n` in up-to-date docker) and `-l` means `--link` (`-l` is short for `--label` now).
See merge request !2001
-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. |