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.

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

Refactor to use individual docker compose files #71

Merged
merged 39 commits into from
Dec 10, 2018
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
565fe24
Added individual compose files
jcortejoso Nov 29, 2018
d62df2a
Merge branch 'develop' of github.com:oceanprotocol/docker-images into…
jcortejoso Nov 30, 2018
cfc4ca2
Fix keeper-contracts/brizo as ethereum rpc provider
jcortejoso Nov 30, 2018
5b0b11e
Removed old compose files
jcortejoso Nov 30, 2018
02a7375
Do not expose mongo interface to docker host
jcortejoso Nov 30, 2018
4947c0f
Added missing export
jcortejoso Nov 30, 2018
18c52bb
Merge branch 'develop' of github.com:oceanprotocol/docker-images into…
jcortejoso Nov 30, 2018
ea0f895
Added brizo env file
jcortejoso Nov 30, 2018
158f175
Merge branch 'develop' of github.com:oceanprotocol/docker-images into…
jcortejoso Dec 4, 2018
f91b0e4
Dependencies updated
jcortejoso Dec 4, 2018
c917328
Exposed keeper port to localhost (pleuston)
jcortejoso Dec 4, 2018
49cf54a
Removed dependency
jcortejoso Dec 4, 2018
f55a386
Removed volume for aquarius
jcortejoso Dec 4, 2018
91499da
refactored to use different blockchain nodes underneath
H34D Dec 5, 2018
1695301
made node exclusive
H34D Dec 5, 2018
dbdd0c3
fix brizo env
H34D Dec 5, 2018
e10d515
refactor more
H34D Dec 5, 2018
6824e83
Merge pull request #74 from oceanprotocol/feature/blockain_nodes
Dec 5, 2018
3065851
refactor more
H34D Dec 6, 2018
d6577aa
renamed pond -> spree, lake -> nile
H34D Dec 6, 2018
26507b0
remove dapps
H34D Dec 6, 2018
af01fc3
fix typo
H34D Dec 6, 2018
b4d3c9f
fix base path
H34D Dec 6, 2018
b094bc7
remove orphans
H34D Dec 6, 2018
cc0c24c
Updated nile network configuration files
jcortejoso Dec 6, 2018
5d0f78f
Merge branch 'feature/refactor' of github.com:oceanprotocol/docker-im…
jcortejoso Dec 6, 2018
daec677
set deploy contracts to false
H34D Dec 6, 2018
9d4effe
remove pwd
H34D Dec 6, 2018
63c8da2
Fixed brizo in kovan
jcortejoso Dec 6, 2018
b85bde5
Merge branch 'feature/refactor' of github.com:oceanprotocol/docker-im…
jcortejoso Dec 6, 2018
01d5fab
move to AuthorityRound for spree node
H34D Dec 6, 2018
6c59f14
fix brizo path
H34D Dec 6, 2018
5a07e99
fix brizo
H34D Dec 6, 2018
22d0dfd
Fix brizo
jcortejoso Dec 7, 2018
49cdc4b
Restored networkid for spree
jcortejoso Dec 7, 2018
1246fae
Comment clean old contracts
jcortejoso Dec 7, 2018
5a477fe
Update keeper-contracts docker, `feature_docker` no longer needed, la…
ssallam Dec 10, 2018
6ded4c8
try to fix brizo
H34D Dec 10, 2018
958448d
remove logging
H34D Dec 10, 2018
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
13 changes: 13 additions & 0 deletions compose-files/aquarius.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: '2.1'
services:
aquarius:
image: oceanprotocol/aquarius:${OCEAN_VERSION:-stable}
ports:
- 5000:5000
networks:
backend:
ipv4_address: 172.15.0.15
depends_on:
- mongodb
environment:
DB_HOSTNAME: mongodb
17 changes: 17 additions & 0 deletions compose-files/brizo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: '2.1'
services:
brizo:
image: oceanprotocol/brizo:${OCEAN_VERSION:-stable}
ports:
- 8030:8030
networks:
backend:
ipv4_address: 172.15.0.17
depends_on:
- keeper-contracts
env_file:
ttmc marked this conversation as resolved.
Show resolved Hide resolved
- ${BRIZO_ENV_FILE}
environment:
KEEPER_URL: http://${RPC_URL}:8545
ttmc marked this conversation as resolved.
Show resolved Hide resolved
volumes:
- ${ARTIFACTS_FOLDER}:/usr/local/keeper-contracts/:ro
19 changes: 19 additions & 0 deletions compose-files/keeper_contracts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '2.1'
services:
keeper-contracts:
image: oceanprotocol/keeper-contracts:${OCEAN_VERSION:-stable}
ports:
- "${KEEPER_PORT}:8545"
networks:
backend:
ipv4_address: 172.15.0.14
environment:
LOCAL_CONTRACTS: "true"
DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS}
DATABASE_PATH: "/ganache-db"
REUSE_DATABASE: ${REUSE_DATABASE}
NETWORK_NAME: ${KEEPER_NETWORK_NAME}
POA_HOST: "parity-node"
volumes:
- ${ARTIFACTS_FOLDER}:/keeper-contracts/artifacts/
- ${GANACHE_DATABASE_PATH}/ganache-db:/ganache-db
8 changes: 8 additions & 0 deletions compose-files/mongo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: '2.1'
services:
mongodb:
image: mongo:3.6
command: mongod
networks:
backend:
ipv4_address: 172.15.0.11
14 changes: 14 additions & 0 deletions compose-files/network_volumes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: '2.1'

networks:
backend:
driver: bridge
ipam:
driver: default
config:
- subnet: 172.15.0.1/24
gateway: 172.15.0.1

volumes:
parity-node:
secret-store:
30 changes: 30 additions & 0 deletions compose-files/parity_client.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
version: '2.1'
services:
parity-node:
image: oceanprotocol/parity-ethereum:beta
entrypoint: /opt/parity/parity
command:
--config /home/parity/parity/config/secretstoreclient.toml
--db-path /home/parity/chains
--keys-path /home/parity/.local/share/io.parity.ethereum/keys
--base-path /home/parity/base
--engine-signer 0x00bd138abd70e2f00903268f3db08f2d25677c9e
--ws-interface all
--jsonrpc-cors all
--jsonrpc-interface all
--jsonrpc-hosts all
--jsonrpc-apis all
--unsafe-expose
--unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e
volumes:
- ../parity/parity/config:/home/parity/parity/config
- parity-node:/home/parity/.local/share/io.parity.ethereum/
- ../parity/parity/authorities/validator0.json:/home/parity/.local/share/io.parity.ethereum/keys/ocean-network/validator.json
- ../parity/parity/keys:/home/parity/.local/share/io.parity.ethereum/keys/ocean-network
- ../parity/parity/authorities/validator0.pwd:/home/parity/parity/validator.pwd
- ../parity/parity/node0.network.key:/home/parity/.local/share/io.parity.ethereum/network/key
ports:
- 8545:8545
networks:
backend:
ipv4_address: 172.15.0.12
19 changes: 19 additions & 0 deletions compose-files/pleuston.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '2.1'
services:
pleuston:
image: oceanprotocol/pleuston:${OCEAN_VERSION:-stable}
networks:
backend:
ipv4_address: 172.15.0.18
ports:
- 3000:3000
depends_on:
- aquarius
- brizo
environment:
# Need browser to connect to exposed ports
KEEPER_HOST: localhost
AQUARIUS_HOST: localhost
LOCAL_CONTRACTS: 'true'
volumes:
- ${ARTIFACTS_FOLDER}:/pleuston/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro
31 changes: 31 additions & 0 deletions compose-files/secret_store.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: '2.1'
services:
secret-store:
image: oceanprotocol/parity-ethereum:master
# entrypoint: tail -f /dev/null
entrypoint: /opt/parity/parity
command:
--config /etc/parity/secretstore/config.toml --jsonrpc-cors all --jsonrpc-interface all --jsonrpc-hosts all --jsonrpc-apis all
volumes:
- ../parity/secret_store/config/:/etc/parity/secretstore/
- secret-store:/parity_data/
- ../parity/secret_store/keys/:/parity_data/keys/ocean-network/
ports:
- 12000:12000
- 12001
networks:
backend:
ipv4_address: 172.15.0.13

secret-store-cors-proxy:
image: nginx:alpine
volumes:
- ../cors-proxy.conf:/etc/nginx/nginx.conf:ro
depends_on:
- secret-store
ports:
- 12001:12001
networks:
backend:
ipv4_address: 172.15.0.16
command: nginx -g 'daemon off;'
130 changes: 0 additions & 130 deletions docker-compose-local-parity-node.yml

This file was deleted.

61 changes: 0 additions & 61 deletions docker-compose-no-pleuston.yml

This file was deleted.

Loading