From 3a68f69e4846ff6009f2c1e6b2bea89fae13a772 Mon Sep 17 00:00:00 2001 From: apostolof Date: Wed, 17 Feb 2021 22:18:56 +0200 Subject: [PATCH] fix: final fixes for local runs --- docker/Makefile | 12 ++++++------ docker/env/concordia.env | 2 +- docker/env/contracts-provider.env | 1 + docker/env/contracts.env | 2 +- docker/env/pinner.env | 8 +++++--- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index c5a6b9e..679592f 100755 --- a/docker/Makefile +++ b/docker/Makefile @@ -74,21 +74,21 @@ run-app-host-chain: build-contracts-provider: @docker build ../ -f ./concordia-contracts-provider/Dockerfile -t ecentrics/concordia-contracts-provider --build-arg TZ=Europe/Athens run-contracts-provider-staging: - @docker run -d -v ${CONTRACTS_PROVIDER_VOLUMES}/contracts:/mnt/concordia/contracts -v ${CONTRACTS_PROVIDER_VOLUMES}/contracts:/mnt/concordia/logs --env-file=./env/contracts-provider.env -p 8400:8400 --name concordia-contracts-provider --net=concordia_concordia_network ecentrics/concordia-contracts-provider:latest + @docker run -d -v ${CONTRACTS_PROVIDER_VOLUMES}:/mnt/concordia --env-file=./env/contracts-provider.env -p 8400:8400 --name concordia-contracts-provider --net=concordia_concordia_network ecentrics/concordia-contracts-provider:latest run-contracts-provider: - @docker run -d -v ${CONTRACTS_PROVIDER_VOLUMES}/contracts:/mnt/concordia/contracts -v ${CONTRACTS_PROVIDER_VOLUMES}/contracts:/mnt/concordia/logs --env-file=./env/contracts-provider.env -e NODE_ENV=production -p 8400:8400 --name concordia-contracts-provider --net=concordia_concordia_network ecentrics/concordia-contracts-provider:latest + @docker run -d -v ${CONTRACTS_PROVIDER_VOLUMES}:/mnt/concordia --env-file=./env/contracts-provider.env -e NODE_ENV=production -p 8400:8400 --name concordia-contracts-provider --net=concordia_concordia_network ecentrics/concordia-contracts-provider:latest # Pinner targets build-pinner: @docker build ../ -f ./concordia-pinner/Dockerfile -t ecentrics/concordia-pinner --build-arg TZ=Europe/Athens run-pinner-staging: - @docker run -d -v ${PINNER_VOLUMES}/orbitdb:/mnt/concordia/orbitdb -v ${PINNER_VOLUMES}:/mnt/concordia/logs --env-file=./env/pinner.env -p 4444:4444 --name concordia-pinner --net=concordia_concordia_network ecentrics/concordia-pinner:latest + @docker run -d -v ${PINNER_VOLUMES}:/mnt/concordia --env-file=./env/pinner.env -p 4444:4444 --name concordia-pinner --net=concordia_concordia_network ecentrics/concordia-pinner:latest run-pinner: - @docker run -d -v ${PINNER_VOLUMES}/orbitdb:/mnt/concordia/orbitdb -v ${PINNER_VOLUMES}:/mnt/concordia/logs --env-file=./env/pinner.env -e NODE_ENV=production -p 4444:4444 --name concordia-pinner --net=concordia_concordia_network ecentrics/concordia-pinner:latest + @docker run -d -v ${PINNER_VOLUMES}:/mnt/concordia --env-file=./env/pinner.env -e NODE_ENV=production -p 4444:4444 --name concordia-pinner --net=concordia_concordia_network ecentrics/concordia-pinner:latest run-pinner-staging-host: - @docker run -d -v ${PINNER_VOLUMES}/orbitdb:/mnt/concordia/orbitdb -v ${PINNER_VOLUMES}:/mnt/concordia/logs --env-file=./env/pinner.env --net=host --name concordia-pinner ecentrics/concordia-pinner:latest + @docker run -d -v ${PINNER_VOLUMES}:/mnt/concordia --env-file=./env/pinner.env --net=host --name concordia-pinner ecentrics/concordia-pinner:latest run-pinner-host: - @docker run -d -v ${PINNER_VOLUMES}/orbitdb:/mnt/concordia/orbitdb -v ${PINNER_VOLUMES}:/mnt/concordia/logs --env-file=./env/pinner.env -e NODE_ENV=production --net=host --name concordia-pinner ecentrics/concordia-pinner:latest + @docker run -d -v ${PINNER_VOLUMES}:/mnt/concordia --env-file=./env/pinner.env -e NODE_ENV=production --net=host --name concordia-pinner ecentrics/concordia-pinner:latest # Other clean-images: diff --git a/docker/env/concordia.env b/docker/env/concordia.env index 42652e7..4f270ad 100755 --- a/docker/env/concordia.env +++ b/docker/env/concordia.env @@ -1,4 +1,4 @@ # Variables needed in runtime (in browser) -REACT_APP_RENDEZVOUS_HOST=127.0.0.1 +REACT_APP_RENDEZVOUS_HOST=/ip4/127.0.0.1 REACT_APP_RENDEZVOUS_PORT=9090 USE_EXTERNAL_CONTRACTS_PROVIDER=true diff --git a/docker/env/contracts-provider.env b/docker/env/contracts-provider.env index 9d43b56..bb882ef 100644 --- a/docker/env/contracts-provider.env +++ b/docker/env/contracts-provider.env @@ -1,2 +1,3 @@ UPLOAD_CONTRACTS_DIRECTORY=/mnt/concordia/contracts/ LOGS_PATH=/mnt/concordia/logs/ +#CORS_ALLOWED_ORIGINS="http://127.0.0.1:7000;http://localhost:7000;http://127.0.0.1:4444;127.0.0.1:4444" diff --git a/docker/env/contracts.env b/docker/env/contracts.env index 4e68772..c1f2ed9 100755 --- a/docker/env/contracts.env +++ b/docker/env/contracts.env @@ -3,6 +3,6 @@ MIGRATE_NETWORK=env WEB3_HOST=concordia-ganache WEB3_PORT=8545 -CONTRACTS_PROVIDER_HOST=concordia-contracts-provider +CONTRACTS_PROVIDER_HOST=http://concordia-contracts-provider CONTRACTS_PROVIDER_PORT=8400 CONTRACTS_VERSION_TAG=docker diff --git a/docker/env/pinner.env b/docker/env/pinner.env index 65b605e..e59052d 100644 --- a/docker/env/pinner.env +++ b/docker/env/pinner.env @@ -1,15 +1,17 @@ USE_EXTERNAL_CONTRACTS_PROVIDER=true +IPFS_DIRECTORY=/mnt/concordia/ipfs ORBIT_DIRECTORY=/mnt/concordia/orbitdb LOGS_PATH=/mnt/concordia/logs/ -CONTRACTS_PROVIDER_HOST=concordia-contracts-provider +CONTRACTS_PROVIDER_HOST=http://concordia-contracts-provider CONTRACTS_PROVIDER_PORT=8400 -CONTRACTS_VERSION_HASH=latest +CONTRACTS_VERSION_HASH=docker PINNER_API_HOST=127.0.0.1 PINNER_API_PORT=4444 -RENDEZVOUS_HOST=concordia-rendezvous +RENDEZVOUS_HOST=/docker/concordia-rendezvous +#RENDEZVOUS_HOST=/ip4/172.20.0.2 RENDEZVOUS_PORT=9090 WEB3_HOST=concordia-ganache