diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 06:07:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 06:07:59 +0000 |
| commit | 7421e6f9f2b5889b05738af7eba568af6ae3fcbc (patch) | |
| tree | 0c7f9656565ae4ef09611345248ea518c4deb5b8 /doc/ci/services | |
| parent | bf32dbaad2b059a3bf3e880c08cb0a026effc158 (diff) | |
| download | gitlab-ce-7421e6f9f2b5889b05738af7eba568af6ae3fcbc.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/services')
| -rw-r--r-- | doc/ci/services/docker-services.md | 2 | ||||
| -rw-r--r-- | doc/ci/services/postgres.md | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/ci/services/docker-services.md b/doc/ci/services/docker-services.md index e5fc7a3c85f..fdd38ed4c4e 100644 --- a/doc/ci/services/docker-services.md +++ b/doc/ci/services/docker-services.md @@ -1,3 +1,5 @@ --- redirect_to: 'README.md' --- + +This document was moved to [another location](README.md). diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md index 4cf3e429c63..cf34c28497e 100644 --- a/doc/ci/services/postgres.md +++ b/doc/ci/services/postgres.md @@ -45,11 +45,11 @@ 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][hub-pg]. +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 -check the documentation on [Docker Hub][hub-pg]. +check the documentation on [Docker Hub](https://hub.docker.com/_/postgres). ## Use PostgreSQL with the Shell executor @@ -115,12 +115,9 @@ Database: nice_marmot ## Example project -We have set up an [Example PostgreSQL Project][postgres-example-repo] for your +We have set up an [Example PostgreSQL Project](https://gitlab.com/gitlab-examples/postgres) for your convenience that runs on [GitLab.com](https://gitlab.com) using our publicly available [shared runners](../runners/README.md). Want to hack on it? Simply fork it, commit and push your changes. Within a few moments the changes will be picked by a public runner and the job will begin. - -[hub-pg]: https://hub.docker.com/_/postgres -[postgres-example-repo]: https://gitlab.com/gitlab-examples/postgres |