diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-02-08 10:54:25 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-03-27 08:54:35 +0300 |
| commit | e22ee5eee0946b1be7ff08cc7fbf7f70295cef0f (patch) | |
| tree | 2a7b0961a25571db985ee58beb67c240904d1929 /.gitlab-ci.yml | |
| parent | f837a0bfc6890d9622e0c9b6a7528261c976c4b8 (diff) | |
ci: Remove workaround for PgBouncer auth user
Remove the workaround for specifying the PgBouncer auth user and instead
use the upstreamed `PGBOUNCER_AUTH_USER` variable.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82d328fc3..97fdfd87a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -256,15 +256,11 @@ test:pgbouncer: <<: *test_variables # The following variables are used by PgBouncer to connect to Postgres. POSTGRESQL_HOST: "${PGHOST}" - # The image doesn't support setting `auth_user`, so we're cheating and use - # "command line injection" here. In any case, `auth_user` is required so - # that we can connect as a different user, but authenticate as the actual - # PGUSER. We can fix this when - # https://github.com/bitnami/bitnami-docker-pgbouncer/pull/22 lands. - POSTGRESQL_PORT: "${PGPORT} auth_user=${PGUSER}" + POSTGRESQL_PORT: "${PGPORT}" POSTGRESQL_USERNAME: "${PGUSER}" # These variables define how PgBouncer itself is configured PGBOUNCER_AUTH_TYPE: trust + PGBOUNCER_AUTH_USER: "${PGUSER}" PGBOUNCER_DATABASE: "*" PGBOUNCER_IGNORE_STARTUP_PARAMETERS: extra_float_digits PGBOUNCER_POOL_MODE: transaction |