Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3 #219

Merged
merged 58 commits into from
Oct 27, 2020
Merged

v3 #219

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a4e32d3
first cut
alexcos20 Jun 26, 2020
c9a32ed
fix provider
alexcos20 Jun 26, 2020
acc399f
fix provider
alexcos20 Jun 26, 2020
b6df445
add ganache
alexcos20 Jun 28, 2020
96a0df6
make dashboard optional
alexcos20 Jun 28, 2020
13733f2
fix elastic
alexcos20 Jun 28, 2020
76477e8
fix mongodb
alexcos20 Jun 28, 2020
1b5acb5
Update start_ocean.sh
alexcos20 Jul 1, 2020
9083915
more ganache options
alexcos20 Jul 6, 2020
10e29cc
more ganache options
alexcos20 Jul 7, 2020
a42e4bb
update envvar
Jul 8, 2020
fbf261e
Update start_ocean.sh
alexcos20 Jul 14, 2020
5118cbe
Update start_ocean.sh
alexcos20 Jul 15, 2020
b2fa3c1
Update provider.yml
alexcos20 Jul 15, 2020
c148e44
Fix provider issue, remove references to keeper
Jul 15, 2020
a1d8c24
Merge remote-tracking branch 'origin/v3' into v3
Jul 15, 2020
0299f33
Remove extra line.
Jul 15, 2020
b623171
temporary provider will use one worker
alexcos20 Jul 30, 2020
07131ce
Support decentralized ddo
Sep 8, 2020
528df38
Make ganache run persist with db cache
Sep 8, 2020
12d6e01
add discord link
kremalicious Sep 8, 2020
09c97c7
script cleanup, sync script and docs
kremalicious Sep 8, 2020
99640d2
add ocean-contracts compose file.
Sep 9, 2020
1b5deda
fix errors, remove ganache blockTime option.
Sep 11, 2020
b4bd7bd
use ocean-contracts:test docker image until it is merged to master.
Sep 11, 2020
da93e10
set contracts version in start_ocean
Sep 11, 2020
7ee85c9
Use aquarius `latest` tag.
Sep 11, 2020
b61407d
Update readme file, fix error in setting default ocean-contracts vers…
Sep 11, 2020
fc40685
update aquarius default version.
Sep 11, 2020
5215ee5
small fixes
alexcos20 Sep 15, 2020
cf8a149
lock Aquarius & Provider versions
kremalicious Sep 16, 2020
5e164c2
Update start_ocean.sh
alexcos20 Sep 17, 2020
f35b318
use provider v0.3.0
Sep 17, 2020
5e215d6
Merge branch 'v3' into feature/ocean-contracts
alexcos20 Sep 17, 2020
5f894dc
Merge pull request #220 from oceanprotocol/feature/ocean-contracts
alexcos20 Sep 17, 2020
0c51bcc
Update start_ocean.sh
alexcos20 Sep 17, 2020
05ec7c4
set aquarius url for the provider container.
Sep 22, 2020
4c354e3
Update start_ocean.sh
alexcos20 Sep 23, 2020
15ad93f
update default versions
Sep 23, 2020
f5691db
Merge branch 'feature/did-datatoken' into v3
Sep 23, 2020
0519b8d
docs update
kremalicious Sep 24, 2020
ce67c07
Update start_ocean.sh
alexcos20 Oct 2, 2020
9929cdf
Update ganache.yml
alexcos20 Oct 2, 2020
adf7499
Update ganache.yml
alexcos20 Oct 2, 2020
5716076
Update start_ocean.sh
alexcos20 Oct 2, 2020
44ebd4f
Update start_ocean.sh
alexcos20 Oct 12, 2020
6bb0456
Update aquarius_elasticsearch.yml
alexcos20 Oct 12, 2020
7c21742
Update start_ocean.sh
alexcos20 Oct 12, 2020
cb45cf7
remove unused aquarius compose files
kremalicious Oct 13, 2020
52d9279
update docs
kremalicious Oct 13, 2020
ccc685f
remove mongodb option from script
kremalicious Oct 13, 2020
444fb56
cleanup
kremalicious Oct 13, 2020
efc24d9
Merge pull request #221 from oceanprotocol/feature/v3-aquarius
alexcos20 Oct 13, 2020
10e3ebe
Update start_ocean.sh
alexcos20 Oct 14, 2020
c48be04
add option to allow skipping contract deployment.
Oct 21, 2020
ea9699a
Update start_ocean.sh
alexcos20 Oct 22, 2020
f0041b0
update versions
alexcos20 Oct 27, 2020
2c4f72c
Merge branch 'v3' of https://github.com/oceanprotocol/barge into v3
alexcos20 Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions compose-files/provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ services:
IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY}
OCEAN_PROVIDER_TIMEOUT: '9000'
OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL}
AQUARIUS_URL: ${AQUARIUS_URL:-http://172.15.0.5:5000}
alexcos20 marked this conversation as resolved.
Show resolved Hide resolved
volumes:
- ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/
4 changes: 2 additions & 2 deletions start_ocean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ COMPOSE_DIR="${DIR}/compose-files"
# Default versions of Aquarius, Provider

export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3}
export PROVIDER_VERSION=${PROVIDER_VERSION:-latest}
export CONTRACTS_VERSION=${CONTRACTS_VERSION:-latest}
export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0}
export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.4.4}
export PROJECT_NAME="ocean"
export FORCEPULL="false"

Expand Down