Commit 58694e04 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'patch-73' into 'master'

New Postgres image requirement

See merge request gitlab-org/gitlab!25315
parents 4c691b22 8cda693d
...@@ -22,22 +22,23 @@ services: ...@@ -22,22 +22,23 @@ services:
variables: variables:
POSTGRES_DB: nice_marmot POSTGRES_DB: nice_marmot
POSTGRES_USER: runner POSTGRES_USER: runner
POSTGRES_PASSWORD: "runner-password" POSTGRES_PASSWORD: ""
POSTGRES_HOST_AUTH_METHOD: trust
``` ```
NOTE: **Note:** NOTE: **Note:**
The `POSTGRES_DB`, `POSTGRES_USER`, and `POSTGRES_PASSWORD` variables can't be set in The `POSTGRES_DB`, `POSTGRES_USER`, `POSTGRES_PASSWORD` and `POSTGRES_HOST_AUTH_METHOD`
the GitLab UI. To set them, assign them to a variable 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 [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 variable to the `POSTGRES_DB`, `POSTGRES_USER`, `POSTGRES_PASSWORD` and `POSTGRES_HOST_AUTH_METHOD`
your `.gitlab-ci.yml`. variables in your `.gitlab-ci.yml`.
And then configure your application to use the database, for example: And then configure your application to use the database, for example:
```yaml ```yaml
Host: postgres Host: postgres
User: runner User: runner
Password: runner-password Password: ''
Database: nice_marmot Database: nice_marmot
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment