From f2ec4ce2edc09755317778a073bcdc1c88ef49b0 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Tue, 2 Jan 2018 15:57:57 +0200
Subject: [PATCH] Move docker-compose.yml under the docker directory

---
 .../docker-compose.yml                        | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)
 rename docker-compose.yml => docker/docker-compose.yml (89%)

diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 89%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index bda0771c3..d591ceeb5 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,10 +4,10 @@ services:
     container_name: dendrite_monolith
     hostname: monolith
     entrypoint: ["bash", "./docker/services/monolith.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     networks:
       - internal
@@ -21,10 +21,10 @@ services:
     container_name: dendrite_client_api_proxy
     hostname: client_api_proxy
     entrypoint: ["bash", "./docker/services/client-api-proxy.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     networks:
       - internal
@@ -41,10 +41,10 @@ services:
     container_name: dendrite_client_api
     hostname: client_api
     entrypoint: ["bash", "./docker/services/client-api.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -58,10 +58,10 @@ services:
     container_name: dendrite_media_api
     hostname: media_api
     entrypoint: ["bash", "./docker/services/media-api.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -74,10 +74,10 @@ services:
     container_name: dendrite_public_rooms_api
     hostname: public_rooms_api
     entrypoint: ["bash", "./docker/services/public-rooms-api.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -90,10 +90,10 @@ services:
     container_name: dendrite_sync_api
     hostname: sync_api
     entrypoint: ["bash", "./docker/services/sync-api.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -106,10 +106,10 @@ services:
     container_name: dendrite_room_server
     hostname: room_server
     entrypoint: ["bash", "./docker/services/room-server.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -122,10 +122,10 @@ services:
     container_name: dendrite_federation_api_proxy
     hostname: federation_api_proxy
     entrypoint: ["bash", "./docker/services/federation-api-proxy.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -141,10 +141,10 @@ services:
     container_name: dendrite_federation_api
     hostname: federation_api
     entrypoint: ["bash", "./docker/services/federation-api.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -157,10 +157,10 @@ services:
     container_name: dendrite_federation_sender
     hostname: federation_sender
     entrypoint: ["bash", "./docker/services/federation-sender.sh"]
-    build: ./docker
+    build: ./
     volumes:
       - type: bind
-        source: ./
+        source: ../
         target: /build
     depends_on:
       - postgres
@@ -175,7 +175,7 @@ services:
     image: postgres:9.5
     restart: always
     volumes:
-      - ./docker/postgres/create_db.sh:/docker-entrypoint-initdb.d/20-create_db.sh
+      - ./postgres/create_db.sh:/docker-entrypoint-initdb.d/20-create_db.sh
     environment:
       POSTGRES_PASSWORD: itsasecret
       POSTGRES_USER: dendrite