From 9672209356c08aa17e809f116ff03b8f216690ad Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Sun, 6 Dec 2020 13:50:49 +0200
Subject: [PATCH] Add docker suffix to ganache env files, Change app port

---
 docker/Makefile                                          | 6 +++---
 docker/docker-compose.yml                                | 2 +-
 docker/env/{ganache.env => ganache.docker.env}           | 0
 docker/env/{ganache.test.env => ganache.test.docker.env} | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename docker/env/{ganache.env => ganache.docker.env} (100%)
 rename docker/env/{ganache.test.env => ganache.test.docker.env} (100%)

diff --git a/docker/Makefile b/docker/Makefile
index 3caa06f..4bed64b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -17,10 +17,10 @@ build-ganache:
 	@docker build ../ -f ./ganache/Dockerfile -t concordia-ganache
 run-ganache:
 	@docker network create --driver bridge concordia_ganache_network || true &&\
-	docker run -d -v ${GANACHE_VOLUMES}/ganache_db:/home/ganache_db -v ${GANACHE_VOLUMES}/ganache_keys:/home/ganache_keys -p 8545:8545 --env-file=./env/ganache.env --name concordia-ganache --net=concordia_ganache_network concordia-ganache:latest
+	docker run -d -v ${GANACHE_VOLUMES}/ganache_db:/home/ganache_db -v ${GANACHE_VOLUMES}/ganache_keys:/home/ganache_keys -p 8545:8545 --env-file=./env/ganache.docker.env --name concordia-ganache --net=concordia_ganache_network concordia-ganache:latest
 run-ganache-test:
 	@docker network create --driver bridge concordia_ganache_test_network || true &&\
-	docker run --rm -d -p 8546:8546 --env-file=./env/ganache.test.env --name concordia-ganache-test --net=concordia_ganache_test_network concordia-ganache:latest
+	docker run --rm -d -p 8546:8546 --env-file=./env/ganache.test.docker.env --name concordia-ganache-test --net=concordia_ganache_test_network concordia-ganache:latest
 
 # Rendezvous targets
 run-rendezvous:
@@ -53,7 +53,7 @@ build-app-tests:
 run-app-tests:
 	@docker run --rm -v ${REPORTS}/app/:/usr/test-reports/ --env-file=./env/concordia.docker.env concordia-app-tests:latest
 run-app:
-	@docker create --env-file=./env/concordia.docker.env -p 8473:80 --name concordia-app --net=concordia_ganache_network concordia-app:latest &&\
+	@docker create --env-file=./env/concordia.docker.env -p 7777: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:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 542be1c..4fb932c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     image: concordia-ganache
     container_name: concordia-ganache
     env_file:
-      - env/ganache.env
+      - env/ganache.docker.env
     expose:
       - 8545
     ports:
diff --git a/docker/env/ganache.env b/docker/env/ganache.docker.env
similarity index 100%
rename from docker/env/ganache.env
rename to docker/env/ganache.docker.env
diff --git a/docker/env/ganache.test.env b/docker/env/ganache.test.docker.env
similarity index 100%
rename from docker/env/ganache.test.env
rename to docker/env/ganache.test.docker.env