From b55b2cf1f6158d17bb6cfada699a546680b8c18e Mon Sep 17 00:00:00 2001
From: Xavier Coulon <xcoulon@redhat.com>
Date: Fri, 13 Oct 2017 17:25:24 +0200
Subject: [PATCH] 'make dev' fails to start because of container connection
 issue on macOS (#1705)

keep the previous changes in `docker-compose.mcos.yml` for now
revert the changes as they break on Linux

Fixes #1705

Signed-off-by: Xavier Coulon <xcoulon@redhat.com>
---
 docker-compose.macos.yaml | 39 +++++++++++++++++++++++++++++++++++++++
 docker-compose.yml        |  8 +++-----
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 docker-compose.macos.yaml

diff --git a/docker-compose.macos.yaml b/docker-compose.macos.yaml
new file mode 100644
index 0000000000..1610a087af
--- /dev/null
+++ b/docker-compose.macos.yaml
@@ -0,0 +1,39 @@
+version: '2'
+
+services:
+  db:
+    image: registry.centos.org/postgresql/postgresql:9.6
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRESQL_ADMIN_PASSWORD: mysecretpassword
+  core:
+    image: docker.io/fabric8/fabric8-wit:latest
+#    command: -config /usr/local/wit/etc/config.yaml
+    environment:
+      F8_AUTH_URL: "http://localhost:8089"
+      F8_DEVELOPER_MODE_ENABLED: "true"
+      F8_POSTGRES_HOST: db
+      F8_POSTGRES_PORT: 5432
+    ports:
+      - "8080:8080"
+    depends_on:
+      - auth
+  db-auth:
+    image: registry.centos.org/postgresql/postgresql:9.6
+    ports:
+      - "5433:5432"
+    environment:
+      POSTGRESQL_ADMIN_PASSWORD: mysecretpassword
+  auth:
+    image: docker.io/fabric8/fabric8-auth:latest
+#    command: -config /usr/local/auth/etc/config.yaml
+    environment:
+      AUTH_WIT_URL: "http://localhost:8080"
+      AUTH_DEVELOPER_MODE_ENABLED: "true"
+      AUTH_POSTGRES_HOST: db-auth
+      AUTH_POSTGRES_PORT: 5432
+    ports:
+      - "8089:8089"
+    depends_on:
+      - db-auth
diff --git a/docker-compose.yml b/docker-compose.yml
index 1610a087af..0528afb428 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,10 +13,9 @@ services:
     environment:
       F8_AUTH_URL: "http://localhost:8089"
       F8_DEVELOPER_MODE_ENABLED: "true"
-      F8_POSTGRES_HOST: db
-      F8_POSTGRES_PORT: 5432
     ports:
       - "8080:8080"
+    network_mode: "host"
     depends_on:
       - auth
   db-auth:
@@ -31,9 +30,8 @@ services:
     environment:
       AUTH_WIT_URL: "http://localhost:8080"
       AUTH_DEVELOPER_MODE_ENABLED: "true"
-      AUTH_POSTGRES_HOST: db-auth
-      AUTH_POSTGRES_PORT: 5432
     ports:
       - "8089:8089"
+    network_mode: "host"
     depends_on:
-      - db-auth
+      - db-auth
\ No newline at end of file