From ac909f5b4ccec58e0bd2e06f38bb7f25b8d78ae0 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Sun, 22 Nov 2020 21:07:37 +0200
Subject: [PATCH] Fix ganache and rendezvous docker configurations

---
 .gitignore                           |  1 +
 docker/Makefile                      | 20 +++++++++++++++++---
 docker/docker-compose.yml            |  2 +-
 docker/ganache/docker-compose.yml    |  5 +++++
 docker/rendezvous/docker-compose.yml |  5 +++++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f929ccf..3102504 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ yarn-error.log*
 
 # Docker volumes
 docker/volumes
+docker/ganache/volumes
 docker/reports
 docker/env/concordia.env
 docker/env/contracts.env
diff --git a/docker/Makefile b/docker/Makefile
index db5c043..84b5937 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -16,12 +16,12 @@ build-contracts-migrate:
 build-contracts-tests:
 	@docker build ../ -f ./concordia-contracts/Dockerfile --target test -t concordia-contracts-tests --build-arg TZ=Europe/Athens
 run-contract-tests:
-	@docker run --rm -v `pwd`/reports/contracts/:/usr/test-reports/ --env-file=./env/contracts.env concordia-contracts-tests:latest
+	@docker run --rm -v `pwd`/reports/contracts/:/usr/test-reports/ --env-file=./env/contracts.env --net=concordia_ganache-network concordia-contracts-tests:latest
 run-contract-tests-host-chain:
 	@docker run --rm -v `pwd`/reports/contracts/:/usr/test-reports/ --env-file=./env/contracts.env --net=host concordia-contracts-tests:latest
 run-contracts-migrate:
 	@cd .. &&\
-	docker run --rm -v `pwd`/packages/concordia-contracts/build/:/usr/src/concordia/packages/concordia-contracts/build/ --env-file=./docker/env/contracts.env concordia-contracts-migrate:latest
+	docker run --rm -v `pwd`/packages/concordia-contracts/build/:/usr/src/concordia/packages/concordia-contracts/build/ --env-file=./docker/env/contracts.env --net=concordia_ganache-network concordia-contracts-migrate:latest
 run-contracts-migrate-host-chain:
 	@cd .. &&\
 	docker run --rm -v `pwd`/packages/concordia-contracts/build/:/usr/src/concordia/packages/concordia-contracts/build/ --env-file=./docker/env/contracts.env --net=host concordia-contracts-migrate:latest
@@ -37,10 +37,24 @@ build-app-tests:
 run-app-tests:
 	@docker run --rm -v `pwd`/reports/app/:/usr/test-reports/ --env-file=./env/concordia.env concordia-app-tests:latest
 run-app:
-	@docker run -d --env-file=./env/concordia.env -p 8473:80 --name concordia-app concordia-app:latest
+	@docker create --env-file=./env/concordia.env -p 8473:80 --name concordia-app --net=concordia_ganache-network concordia-app:latest &&\
+	docker network connect concordia_rendezvous-network concordia-app &&\
+	docker start concordia-app
 run-app-host-chain:
 	@docker run -d --env-file=./env/concordia.env --name concordia-app --net=host concordia-app:latest
 
+# Ganache targets
+build-ganache:
+	@docker build -f ./ganache/Dockerfile -t concordia-ganache
+run-ganache:
+	@docker-compose -f ./ganache/docker-compose.yml -p concordia up -d
+
+# Rendezvous targets
+build-rendezvous:
+	@docker build -f ./rendezvous/Dockerfile -t concordia-rendezvous
+run-rendezvous:
+	@docker-compose -f ./rendezvous/docker-compose.yml -p concordia up -d
+
 # Other
 clean-images:
 	@docker rmi `docker images -q -f "dangling=true"`
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a8e4545..72877ba 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -64,4 +64,4 @@ services:
 
 networks:
   ganache-network:
-  rendezvous-network:
\ No newline at end of file
+  rendezvous-network:
diff --git a/docker/ganache/docker-compose.yml b/docker/ganache/docker-compose.yml
index 22d9361..129692e 100644
--- a/docker/ganache/docker-compose.yml
+++ b/docker/ganache/docker-compose.yml
@@ -11,3 +11,8 @@ services:
     volumes:
       - ./volumes/ganache_db:/home/ganache_db
       - ./volumes/ganache_keys:/home/ganache_keys
+    networks:
+      ganache-network:
+
+networks:
+  ganache-network:
diff --git a/docker/rendezvous/docker-compose.yml b/docker/rendezvous/docker-compose.yml
index ca3d3b3..e4e9b1c 100644
--- a/docker/rendezvous/docker-compose.yml
+++ b/docker/rendezvous/docker-compose.yml
@@ -7,3 +7,8 @@ services:
     restart: always
     ports:
       - "9090:9090"
+    networks:
+      rendezvous-network:
+
+networks:
+  rendezvous-network: