diff mbox series

[5/6] docker-compose: Remove 'links' section

Message ID 20180424210541.6060-6-stephen@that.guru
State Accepted
Headers show
Series Switch to docker-compose 3.0 file format | expand

Commit Message

Stephen Finucane April 24, 2018, 9:05 p.m. UTC 
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>
---
 docker-compose-pg.yml | 7 ++-----
 docker-compose.yml    | 4 ----
 2 files changed, 2 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/docker-compose-pg.yml b/docker-compose-pg.yml
index e403547c..81e0fda5 100644
--- 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 18d60b7b..46c86766 100644
--- 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