summaryrefslogtreecommitdiff
path: root/doc/ci/services
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-28 03:09:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-28 03:09:04 +0000
commit597a43f359c3096d845e764b90439743962e5961 (patch)
tree2593024f91b2eb44e0764107490be4d0f1119ace /doc/ci/services
parentf54a50aa826d0eedcf2e56f51462613bc132f826 (diff)
downloadgitlab-ce-597a43f359c3096d845e764b90439743962e5961.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/services')
-rw-r--r--doc/ci/services/postgres.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md
index 235f237ba94..bd389783a1d 100644
--- a/doc/ci/services/postgres.md
+++ b/doc/ci/services/postgres.md
@@ -22,22 +22,23 @@ services:
variables:
POSTGRES_DB: nice_marmot
POSTGRES_USER: runner
- POSTGRES_PASSWORD: "runner-password"
+ POSTGRES_PASSWORD: ""
+ POSTGRES_HOST_AUTH_METHOD: trust
```
NOTE: **Note:**
-The `POSTGRES_DB`, `POSTGRES_USER`, and `POSTGRES_PASSWORD` variables can't be set in
-the GitLab UI. To set them, assign them to a variable
+The `POSTGRES_DB`, `POSTGRES_USER`, `POSTGRES_PASSWORD` and `POSTGRES_HOST_AUTH_METHOD`
+variables can't be set in the GitLab UI. To set them, assign them to a variable
[in the UI](../variables/README.md#via-the-ui), and then assign that
-variable to the `POSTGRES_DB`, `POSTGRES_USER`, and `POSTGRES_PASSWORD` variables in
-your `.gitlab-ci.yml`.
+variable to the `POSTGRES_DB`, `POSTGRES_USER`, `POSTGRES_PASSWORD` and `POSTGRES_HOST_AUTH_METHOD`
+variables in your `.gitlab-ci.yml`.
And then configure your application to use the database, for example:
```yaml
Host: postgres
User: runner
-Password: runner-password
+Password: ''
Database: nice_marmot
```