summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-10-23 08:42:00 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-10-23 08:42:00 +0000
commit02e283ffc2416dd45c0e574c00c7477e1e725401 (patch)
tree7e9b8eda41be14175aabdcfd61dbeebbabe5ebb5
parentc1ed00e81df21365bd783da8cb40957e474ed35d (diff)
parent5f0663cacf9d8d351b17862a372d0de33f0d57ca (diff)
downloadgitlab-ce-02e283ffc2416dd45c0e574c00c7477e1e725401.tar.gz
Merge branch 'patch-8' into 'master'
Update using_docker_images.md See merge request gitlab-org/gitlab-ce!14988
-rw-r--r--doc/ci/docker/using_docker_images.md4
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index fa823ea4721..f7493794b6a 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -327,10 +327,6 @@ means, that when starting the container without additional options, it will run
the database's process, while Runner expects that the image will have no
entrypoint or at least will start with a shell as its entrypoint.
-Previously we would need to create our own image based on the
-`super/sql:experimental` image, set the entrypoint to a shell, and then use
-it in job's configuration, e.g.:
-
Before the new extended Docker configuration options, you would need to create
your own image based on the `super/sql:experimental` image, set the entrypoint
to a shell and then use it in job's configuration, like: