From 41c29aa8e583be57728d1c397ade94b95adef508 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Fri, 1 Mar 2019 11:11:01 +0100 Subject: [PATCH 1/2] Point Quickstart option 2 to Barge repo for now --- content/concepts/wallets.md | 2 +- content/setup/quickstart.md | 23 ++--------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/content/concepts/wallets.md b/content/concepts/wallets.md index 2746acc2..a090322e 100644 --- a/content/concepts/wallets.md +++ b/content/concepts/wallets.md @@ -40,7 +40,7 @@ We encourage you to search around and read about wallets to understand the optio ## Wallets which Might Work with Ocean Tokens -[ERC-20 tokens](https://en.wikipedia.org/wiki/ERC-20) are the most common kind of tokens found in Ethereum-based networks. **Ocean Tokens are ERC-20 tokens**, so any wallet that supports arbitrary ERC-20 tokens should work to hold Ocean Tokens. +[ERC-20 tokens](https://en.wikipedia.org/wiki/ERC-20) are the most common kind of tokens found in Ethereum-based networks. **Ocean Tokens are ERC-20 tokens**, so any wallet that supports arbitrary ERC-20 tokens should work to hold Ocean Tokens. For example, you could use [MetaMask](https://metamask.io/), either as a stand-alone wallet, or with to a hardware wallet. We have a [tutorial about how to set up MetaMask for Chrome](/tutorials/metamask-setup). diff --git a/content/setup/quickstart.md b/content/setup/quickstart.md index 20f66f1b..fcc2ec68 100644 --- a/content/setup/quickstart.md +++ b/content/setup/quickstart.md @@ -9,27 +9,8 @@ You can [try some free, online Jupyter notebooks](/tutorials/jupyter-notebooks/) ## Option 2 -You can run and try every [Ocean software component](/concepts/components/) in your local machine, all at once, using Docker Compose. +You can run and try every [Ocean software component](/concepts/components/) in your local machine, all at once, using Docker Compose. Ocean Protocol software developers do this often, to test their code against all the other Ocean components. -First, you must [set up some storage on Azure](/tutorials/azure-for-brizo/). (Yes, we know that's not quick. We're working on making a quicker option.) - -Then: - -```bash -git clone https://github.com/oceanprotocol/barge.git -cd barge/ - -./start_ocean.sh --latest -``` - -Seeing the dolphin means it's working: - -![start_ocean.sh](images/dolphin.png) - -Once everything is up and running, you can interact with the components. For example, to interact with Pleuston, go to: - -[http://localhost:3000/](http://localhost:3000/) - -For the details of what components are running, see the [Ocean Protocol barge repository](https://github.com/oceanprotocol/barge). +The Docker Compose files–and instructions to use them–are in [the Barge repository on GitHub](https://github.com/oceanprotocol/barge). From df506b3a68548e5339e52468e93f65aabf16ab63 Mon Sep 17 00:00:00 2001 From: Troy McConaghy Date: Tue, 5 Mar 2019 11:57:27 +0100 Subject: [PATCH 2/2] Bring back option 2 but add initial warning --- content/setup/quickstart.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/content/setup/quickstart.md b/content/setup/quickstart.md index fcc2ec68..c6d20708 100644 --- a/content/setup/quickstart.md +++ b/content/setup/quickstart.md @@ -9,8 +9,24 @@ You can [try some free, online Jupyter notebooks](/tutorials/jupyter-notebooks/) ## Option 2 +**WARNING: This option is more for developers who don't mind some things not working together as expected (if at all). Eventually there will be a default-working version, but that doesn't exist yet.** + You can run and try every [Ocean software component](/concepts/components/) in your local machine, all at once, using Docker Compose. Ocean Protocol software developers do this often, to test their code against all the other Ocean components. -The Docker Compose files–and instructions to use them–are in [the Barge repository on GitHub](https://github.com/oceanprotocol/barge). +```bash +git clone https://github.com/oceanprotocol/barge.git +cd barge/ +./start_ocean.sh --latest +``` + +Seeing the dolphin means it's working: + +![start_ocean.sh](images/dolphin.png) + +Once everything is up and running, you can interact with the components. For example, to interact with Pleuston, go to: + +[http://localhost:3000/](http://localhost:3000/) + +For the details of what components are running, see the [Ocean Protocol barge repository](https://github.com/oceanprotocol/barge).