diff --git a/docker/env/pinner.env b/docker/env/pinner.env index e59052d..0c7f948 100644 --- a/docker/env/pinner.env +++ b/docker/env/pinner.env @@ -11,7 +11,6 @@ PINNER_API_HOST=127.0.0.1 PINNER_API_PORT=4444 RENDEZVOUS_HOST=/docker/concordia-rendezvous -#RENDEZVOUS_HOST=/ip4/172.20.0.2 RENDEZVOUS_PORT=9090 WEB3_HOST=concordia-ganache diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index eb980d3..a4eda81 100755 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -449,7 +449,7 @@ pipeline { -p 9090:9090 \ --name concordia-rendezvous \ --net=ecentrics_concordia_staging_network \ - libp2p/js-libp2p-webrtc-star:version-0.20.5' + libp2p/js-libp2p-webrtc-star:version-0.21.1' } else { sh 'docker network connect ecentrics_concordia_staging_network concordia-rendezvous || true' } @@ -476,7 +476,7 @@ pipeline { sh (script: """docker run \ -d \ - -v concordia-contracts-provider-staging:/mnt/concordia/contracts \ + -v concordia-contracts-provider-staging:/mnt/concordia \ --env-file=./jenkins/env/contracts.provider.staging.env \ -p 8450:8450 \ --name concordia-contracts-provider-staging \ @@ -503,7 +503,7 @@ pipeline { sh (script: 'docker run \ -d \ - -v concordia-ganache-staging:/mnt/concordia/ganache_keys \ + -v concordia-ganache-staging:/mnt/concordia \ -p 8555:8555 \ --env-file=./jenkins/env/ganache.staging.jenkins.env \ --name concordia-ganache-staging \ @@ -556,7 +556,7 @@ pipeline { sh """docker run \ -d \ - -v concordia-pinner-staging:/mnt/concordia/orbitdb \ + -v concordia-pinner-staging:/mnt/concordia/ \ -p 5555:5555 \ --env-file=./jenkins/env/pinner.staging.jenkins.env \ --name concordia-pinner-staging \ @@ -613,7 +613,7 @@ pipeline { -p 9090:9090 \ --name concordia-rendezvous \ --net=ecentrics_concordia_production_network \ - libp2p/js-libp2p-webrtc-star:version-0.20.5' + libp2p/js-libp2p-webrtc-star:version-0.21.1' } else { sh 'docker network connect ecentrics_concordia_production_network concordia-rendezvous || true' } @@ -640,7 +640,7 @@ pipeline { sh (script: """docker run \ -d \ - -v concordia-contracts-provider-production:/mnt/concordia/contracts \ + -v concordia-contracts-provider-production:/mnt/concordia \ --env-file=./jenkins/env/contracts.provider.production.env \ -e NODE_ENV=production \ -p 8400:8400 \ @@ -668,7 +668,7 @@ pipeline { sh (script: 'docker run \ -d \ - -v concordia-ganache-production:/mnt/concordia/ganache_keys \ + -v concordia-ganache-production:/mnt/concordia \ -p 8545:8545 \ --env-file=./jenkins/env/ganache.production.jenkins.env \ --name concordia-ganache-production \ @@ -721,7 +721,7 @@ pipeline { sh """docker run \ -d \ - -v concordia-pinner-production:/mnt/concordia/orbitdb \ + -v concordia-pinner-production:/mnt/concordia \ -p 4444:4444 \ -e NODE_ENV=production \ --env-file=./jenkins/env/pinner.production.jenkins.env \ diff --git a/jenkins/env/concordia.production.jenkins.env b/jenkins/env/concordia.production.jenkins.env index 9dc3550..e41a5c5 100755 --- a/jenkins/env/concordia.production.jenkins.env +++ b/jenkins/env/concordia.production.jenkins.env @@ -4,13 +4,13 @@ LETSENCRYPT_HOST=concordia.ecentrics.net LETSENCRYPT_EMAIL=ecentricsgr@gmail.com # Variables needed in runtime (in browser) -REACT_APP_CONCORDIA_HOST=concordia.ecentrics.net +REACT_APP_CONCORDIA_HOST=https://concordia.ecentrics.net REACT_APP_CONCORDIA_PORT=7777 -REACT_APP_RENDEZVOUS_HOST=rendezvous.ecentrics.net +REACT_APP_RENDEZVOUS_HOST=/dns4/rendezvous.ecentrics.net REACT_APP_RENDEZVOUS_PORT=9090 REACT_APP_USE_EXTERNAL_CONTRACTS_PROVIDER=true -REACT_APP_CONTRACTS_PROVIDER_HOST=contracts.concordia.ecentrics.net +REACT_APP_CONTRACTS_PROVIDER_HOST=https://contracts.concordia.ecentrics.net REACT_APP_CONTRACTS_PROVIDER_PORT=8400 REACT_APP_CONTRACTS_VERSION_HASH=stable diff --git a/jenkins/env/concordia.staging.jenkins.env b/jenkins/env/concordia.staging.jenkins.env index 49278b2..9a6c237 100755 --- a/jenkins/env/concordia.staging.jenkins.env +++ b/jenkins/env/concordia.staging.jenkins.env @@ -4,13 +4,13 @@ LETSENCRYPT_HOST=staging.concordia.ecentrics.net LETSENCRYPT_EMAIL=ecentricsgr@gmail.com # Variables needed in runtime (in browser) -REACT_APP_CONCORDIA_HOST=staging.concordia.ecentrics.net +REACT_APP_CONCORDIA_HOST=https://staging.concordia.ecentrics.net REACT_APP_CONCORDIA_PORT=7000 -REACT_APP_RENDEZVOUS_HOST=rendezvous.ecentrics.net +REACT_APP_RENDEZVOUS_HOST=/dns4/rendezvous.ecentrics.net REACT_APP_RENDEZVOUS_PORT=9090 REACT_APP_USE_EXTERNAL_CONTRACTS_PROVIDER=true -REACT_APP_CONTRACTS_PROVIDER_HOST=staging.contracts.concordia.ecentrics.net +REACT_APP_CONTRACTS_PROVIDER_HOST=https://staging.contracts.concordia.ecentrics.net REACT_APP_CONTRACTS_PROVIDER_PORT=8450 REACT_APP_CONTRACTS_VERSION_HASH=latest diff --git a/jenkins/env/contracts.production.jenkins.env b/jenkins/env/contracts.production.jenkins.env index de1fc9d..1cef914 100755 --- a/jenkins/env/contracts.production.jenkins.env +++ b/jenkins/env/contracts.production.jenkins.env @@ -3,6 +3,6 @@ MIGRATE_NETWORK=env WEB3_HOST=concordia-ganache-production WEB3_PORT=8545 -CONTRACTS_PROVIDER_HOST=contracts.concordia.ecentrics.net +CONTRACTS_PROVIDER_HOST=https://contracts.concordia.ecentrics.net CONTRACTS_PROVIDER_PORT=8400 CONTRACTS_VERSION_TAG=stable diff --git a/jenkins/env/contracts.provider.production.env b/jenkins/env/contracts.provider.production.env index e2b1437..8916775 100755 --- a/jenkins/env/contracts.provider.production.env +++ b/jenkins/env/contracts.provider.production.env @@ -5,4 +5,5 @@ LETSENCRYPT_EMAIL=ecentricsgr@gmail.com CONTRACTS_PROVIDER_PORT=8400 UPLOAD_CONTRACTS_DIRECTORY=/mnt/concordia/contracts/ -CORS_ALLOWED_ORIGINS="concordia.ecentrics.net;http://concordia.ecentrics.net;https://concordia.ecentrics.net;concordia.ecentrics.net:7777;http://concordia.ecentrics.net:7777;https://concordia.ecentrics.net:7777;127.0.0.1;http://127.0.0.1;127.0.0.1:7777;http://127.0.0.1" +LOGS_PATH=/mnt/concordia/logs/ +CORS_ALLOWED_ORIGINS="https://concordia.ecentrics.net;http://127.0.0.1:4444;127.0.0.1:4444" diff --git a/jenkins/env/contracts.provider.staging.env b/jenkins/env/contracts.provider.staging.env index 489ded6..cc49be6 100755 --- a/jenkins/env/contracts.provider.staging.env +++ b/jenkins/env/contracts.provider.staging.env @@ -5,4 +5,5 @@ LETSENCRYPT_EMAIL=ecentricsgr@gmail.com CONTRACTS_PROVIDER_PORT=8450 UPLOAD_CONTRACTS_DIRECTORY=/mnt/concordia/contracts/ -#CORS_ALLOWED_ORIGINS="staging.concordia.ecentrics.net;http://staging.concordia.ecentrics.net;https://staging.concordia.ecentrics.net;staging.concordia.ecentrics.net:7000;http://staging.concordia.ecentrics.net:7000;https://staging.concordia.ecentrics.net:7000;172.21.0.4;http://172.21.0.4;127.0.0.1;http://127.0.0.1" +LOGS_PATH=/mnt/concordia/logs/ +CORS_ALLOWED_ORIGINS="https://staging.concordia.ecentrics.net;http://127.0.0.1:5555;127.0.0.1:5555" diff --git a/jenkins/env/contracts.staging.jenkins.env b/jenkins/env/contracts.staging.jenkins.env index 924f433..106a637 100755 --- a/jenkins/env/contracts.staging.jenkins.env +++ b/jenkins/env/contracts.staging.jenkins.env @@ -3,6 +3,6 @@ MIGRATE_NETWORK=env WEB3_HOST=concordia-ganache-staging WEB3_PORT=8555 -CONTRACTS_PROVIDER_HOST=staging.contracts.concordia.ecentrics.net +CONTRACTS_PROVIDER_HOST=https://staging.contracts.concordia.ecentrics.net CONTRACTS_PROVIDER_PORT=8450 CONTRACTS_VERSION_TAG=latest diff --git a/jenkins/env/pinner.production.jenkins.env b/jenkins/env/pinner.production.jenkins.env index 5558f2c..87052f7 100755 --- a/jenkins/env/pinner.production.jenkins.env +++ b/jenkins/env/pinner.production.jenkins.env @@ -5,15 +5,17 @@ LETSENCRYPT_EMAIL=ecentricsgr@gmail.com USE_EXTERNAL_CONTRACTS_PROVIDER=true ORBIT_DIRECTORY=/mnt/concordia/orbitdb +IPFS_DIRECTORY=/mnt/concordia/ipfs +LOGS_PATH=/mnt/concordia/logs/ -CONTRACTS_PROVIDER_HOST=contracts.concordia.ecentrics.net +CONTRACTS_PROVIDER_HOST=https://contracts.concordia.ecentrics.net CONTRACTS_PROVIDER_PORT=8400 CONTRACTS_VERSION_HASH=stable -PINNER_API_HOST=127.0.0.1 +PINNER_API_HOST=https://127.0.0.1 PINNER_API_PORT=4444 -RENDEZVOUS_HOST=rendezvous.ecentrics.net +RENDEZVOUS_HOST=/dns4/rendezvous.ecentrics.net RENDEZVOUS_PORT=9090 WEB3_HOST=ganache.ecentrics.net diff --git a/jenkins/env/pinner.staging.jenkins.env b/jenkins/env/pinner.staging.jenkins.env index d4998d2..1410813 100755 --- a/jenkins/env/pinner.staging.jenkins.env +++ b/jenkins/env/pinner.staging.jenkins.env @@ -5,15 +5,17 @@ LETSENCRYPT_EMAIL=ecentricsgr@gmail.com USE_EXTERNAL_CONTRACTS_PROVIDER=true ORBIT_DIRECTORY=/mnt/concordia/orbitdb +IPFS_DIRECTORY=/mnt/concordia/ipfs +LOGS_PATH=/mnt/concordia/logs/ -CONTRACTS_PROVIDER_HOST=staging.contracts.concordia.ecentrics.net +CONTRACTS_PROVIDER_HOST=https://staging.contracts.concordia.ecentrics.net CONTRACTS_PROVIDER_PORT=8450 CONTRACTS_VERSION_HASH=latest -PINNER_API_HOST=127.0.0.1 +PINNER_API_HOST=https://127.0.0.1 PINNER_API_PORT=5555 -RENDEZVOUS_HOST=rendezvous.ecentrics.net +RENDEZVOUS_HOST=/dns4/rendezvous.ecentrics.net RENDEZVOUS_PORT=9090 WEB3_HOST=staging.ganache.ecentrics.net