docker-compose: Remove 'links' section

This is no longer needed as the service name is also the host names in
v2 syntax [1].

[1] https://docs.docker.com/compose/networking/

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/docker-compose-pg.yml b/docker-compose-pg.yml
index e403547cae6fa79fbeff7064c744424719848fc8..81e0fda5aa5a438d8be55e4277e4a1de64f31edf 100644 (file)
--- a/docker-compose-pg.yml
+++ b/docker-compose-pg.yml
@@ -6,6 +6,8 @@ services:
       - ./tools/docker/db/postdata:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=password
+      - PGUSER=postgres
+      - PGPASSWORD=password
 
   web:
     build:
@@ -18,13 +20,8 @@ services:
       - .:/home/patchwork/patchwork/
     ports:
       - "8000:8000"
-    # TODO(stephenfin): links are deprecated and should be replaced
-    # with user-defined networks
-    links:
-      - db
     environment:
       - UID
-      - PGPASSWORD=password
       - PW_TEST_DB_HOST=db
       - PW_TEST_DB_PORT=5432
       - PW_TEST_DB_TYPE=postgres

diff --git a/docker-compose.yml b/docker-compose.yml
index 18d60b7ba689c80252c18f4df8a8114a1c54633b..46c86766d2ba8dc6e447cc87f59d9143a46264a0 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,10 +20,6 @@ services:
       - .:/home/patchwork/patchwork/
     ports:
       - "8000:8000"
-    # TODO(stephenfin): links are deprecated and should be replaced
-    # with user-defined networks
-    links:
-      - db
     environment:
       - UID
       - PW_TEST_DB_HOST=db