From: Stephen Finucane <stephen@that.guru>
Date: Wed, 2 May 2018 15:06:25 +0000 (+0100)
Subject: docker-compose: Re-add 'PGPASSWORD' to correct section
X-Git-Tag: v2.1.0-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29c704a9a1a4014cb7be3415099f7660d26f9867;p=thirdparty%2Fpatchwork.git

docker-compose: Re-add 'PGPASSWORD' to correct section

This was moved in commit '1590c21d' but should not have been. Restore it
to its rightful place.

Signed-off-by: Stephen Finucane <stephen@that.guru>
Fixes: 1590c21d ("docker-compose: Remove 'links' section")
Tested-by: Daniel Axtens <dja@axtens.net>
---

diff --git a/docker-compose-pg.yml b/docker-compose-pg.yml
index fdc3fbef..7bb579c3 100644
--- a/docker-compose-pg.yml
+++ b/docker-compose-pg.yml
@@ -6,8 +6,6 @@ services:
       - ./tools/docker/db/postdata:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=password
-      - PGUSER=postgres
-      - PGPASSWORD=password
 
   web:
     build:
@@ -29,3 +27,4 @@ services:
       - PW_TEST_DB_TYPE=postgres
       - PW_TEST_DB_USER=postgres
       - PW_TEST_DB_PASS=password
+      - PGPASSWORD=password