summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-26 23:13:10 +0000
committerStan Hu <stanhu@gmail.com>2015-09-26 23:13:10 +0000
commite2016ba367563a9605c1f3528a4f1c540300afa1 (patch)
treef8417ede58c63c7a3312d9361de64e92dffd99cc
parent6d6918105941bcb868b59350f56eb2f76efd7cf5 (diff)
parent05f29a5cb30d640455a2f4336599a145bc0d0af7 (diff)
downloadgitlab-ce-e2016ba367563a9605c1f3528a4f1c540300afa1.tar.gz
Merge branch 'patch-1' into 'master'
Fixed grammar on Using Docker Build doc. See merge request !1448
-rw-r--r--doc/ci/docker/using_docker_build.md5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index a698fbc8184..5af27470d2f 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -1,6 +1,6 @@
# Using Docker Build
-GitLab CI can allows you to use Docker Engine to build and test docker-based projects.
+GitLab CI allows you to use Docker Engine to build and test docker-based projects.
**This also allows to you to use `docker-compose` and other docker-enabled tools.**
@@ -108,5 +108,4 @@ In order to do that follow the steps:
```
1. However, by enabling `--docker-privileged` you are effectively disables all security mechanisms of containers and exposing your host to privilege escalation which can lead to container breakout.
-For more information you could be interested in checking out [Runtime privilege](https://docs.docker.com/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration).
-
+For more information, check out [Runtime privilege](https://docs.docker.com/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration). \ No newline at end of file