diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-27 12:08:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-27 12:08:30 +0300 |
| commit | 7892ed2e23152070d626f583888eb24a3b801c0e (patch) | |
| tree | afaf4812551be70e3974d1e6b4c2c20191c9b72c /doc/ci/services | |
| parent | 5c763ac4c62bdeb0f0fe26f710c0a7a91921a949 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/services')
| -rw-r--r-- | doc/ci/services/mysql.md | 2 | ||||
| -rw-r--r-- | doc/ci/services/postgres.md | 2 | ||||
| -rw-r--r-- | doc/ci/services/redis.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/services/mysql.md b/doc/ci/services/mysql.md index dcfd863709e..6f1c1d4fd49 100644 --- a/doc/ci/services/mysql.md +++ b/doc/ci/services/mysql.md @@ -43,7 +43,7 @@ Database: <your_mysql_database> If you are wondering why we used `mysql` for the `Host`, read more at [How services are linked to the job](../docker/using_docker_images.md#how-services-are-linked-to-the-job). -You can also use any other docker image available on [Docker Hub](https://hub.docker.com/_/mysql/). +You can also use any other Docker image available on [Docker Hub](https://hub.docker.com/_/mysql/). For example, to use MySQL 5.5 the service becomes `mysql:5.5`. The `mysql` image can accept some environment variables. For more details diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md index 2f92bd969ff..680bee1280f 100644 --- a/doc/ci/services/postgres.md +++ b/doc/ci/services/postgres.md @@ -45,7 +45,7 @@ Database: nice_marmot If you are wondering why we used `postgres` for the `Host`, read more at [How services are linked to the job](../docker/using_docker_images.md#how-services-are-linked-to-the-job). -You can also use any other docker image available on [Docker Hub](https://hub.docker.com/_/postgres). +You can also use any other Docker image available on [Docker Hub](https://hub.docker.com/_/postgres). For example, to use PostgreSQL 9.3 the service becomes `postgres:9.3`. The `postgres` image can accept some environment variables. For more details diff --git a/doc/ci/services/redis.md b/doc/ci/services/redis.md index f22ee87a9d3..414cc4b624a 100644 --- a/doc/ci/services/redis.md +++ b/doc/ci/services/redis.md @@ -30,7 +30,7 @@ Host: redis And that's it. Redis will now be available to be used within your testing framework. -You can also use any other docker image available on [Docker Hub](https://hub.docker.com/_/redis). +You can also use any other Docker image available on [Docker Hub](https://hub.docker.com/_/redis). For example, to use Redis 2.8 the service becomes `redis:2.8`. ## Use Redis with the Shell executor |