summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-12-08 23:49:05 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2015-12-08 23:49:05 +0200
commit1e7156ed701945349bef484d35c7f53f2ee4474b (patch)
tree4f3159e892da4df5a5c5b9de30b80b65d9ce45cb /doc
parentb312edaf440b729dad02749259577f6e0589c061 (diff)
downloadgitlab-ce-1e7156ed701945349bef484d35c7f53f2ee4474b.tar.gz
Use the name of the linked containers instead of localhostci-services-docs
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1917#note_2833978
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/services/mysql.md5
-rw-r--r--doc/ci/services/postgres.md5
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/ci/services/mysql.md b/doc/ci/services/mysql.md
index 44bc613e6f7..c66d77122b2 100644
--- a/doc/ci/services/mysql.md
+++ b/doc/ci/services/mysql.md
@@ -24,12 +24,15 @@ variables:
And then configure your application to use the database, for example:
```yaml
-Host: localhost
+Host: mysql
User: root
Password: mysql_strong_password
Database: el_duderino
```
+If you are wondering why we used `mysql` for the `Host`, read more at
+[How is service linked to the build](../docker/using_docker_images.md#how-is-service-linked-to-the-build).
+
You can also use any other docker image available on [Docker Hub][hub-mysql].
For example, to use MySQL 5.5 the service becomes `mysql:5.5`.
diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md
index db5be070ee7..17d21dbda1c 100644
--- a/doc/ci/services/postgres.md
+++ b/doc/ci/services/postgres.md
@@ -24,12 +24,15 @@ variables:
And then configure your application to use the database, for example:
```yaml
-Host: localhost
+Host: postgres
User: runner
Password:
Database: nice_marmot
```
+If you are wondering why we used `postgres` for the `Host`, read more at
+[How is service linked to the build](../docker/using_docker_images.md#how-is-service-linked-to-the-build).
+
You can also use any other docker image available on [Docker Hub][hub-pg].
For example, to use PostgreSQL 9.3 the service becomes `postgres:9.3`.