From a7eca58ad86587e48bc41631d5acb3f3235f3ce2 Mon Sep 17 00:00:00 2001 From: troymc Date: Thu, 21 Apr 2016 16:36:04 +0200 Subject: [PATCH 01/16] Add ability to install to AWS from local Git branch --- deploy-cluster-aws/fabfile.py | 23 +++++++++++++++----- deploy-cluster-aws/startup.sh | 40 +++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/deploy-cluster-aws/fabfile.py b/deploy-cluster-aws/fabfile.py index f385641b..ec4869da 100644 --- a/deploy-cluster-aws/fabfile.py +++ b/deploy-cluster-aws/fabfile.py @@ -65,9 +65,11 @@ def install_base_software(): sudo('apt-get -y -f install') sudo('apt-get -y install build-essential wget bzip2 ca-certificates \ libglib2.0-0 libxext6 libsm6 libxrender1 libssl-dev \ - git gcc g++ python-dev libboost-python-dev libffi-dev \ + git gcc g++ python3-dev libboost-python-dev libffi-dev \ software-properties-common python-software-properties \ - python3-pip ipython3 sysstat s3cmd') + python3-setuptools ipython3 sysstat s3cmd') + sudo('easy_install3 pip') + sudo('pip install -U pip wheel setuptools') # Install RethinkDB @@ -111,11 +113,22 @@ def install_rethinkdb(): sudo('/etc/init.d/rethinkdb restart') -# Install BigchainDB (from PyPI) +# Install BigchainDB from PyPI @task @parallel -def install_bigchaindb(): - sudo('python3 -m pip install bigchaindb') +def install_bigchaindb_from_pypi(): + sudo('pip install bigchaindb') + + +# Install BigchainDB from a Git archive file +# named bigchaindb-archive.tar.gz +@task +@parallel +def install_bigchaindb_from_git_archive(): + put('bigchaindb-archive.tar.gz') + run('tar xvfz bigchaindb-archive.tar.gz') + sudo('pip install .') + # sudo('python3 setup.py install') # Configure BigchainDB diff --git a/deploy-cluster-aws/startup.sh b/deploy-cluster-aws/startup.sh index 9a73f7f8..89d3e773 100755 --- a/deploy-cluster-aws/startup.sh +++ b/deploy-cluster-aws/startup.sh @@ -1,28 +1,33 @@ #! /bin/bash -# The set -e option instructs bash to immediately exit if any command has a non-zero exit status +# The set -e option instructs bash to immediately exit +# if any command has a non-zero exit status set -e function printErr() { - echo "usage: ./startup.sh " + echo "usage: ./startup.sh " echo "No argument $1 supplied" } -if [ -z "$1" ] - then +if [ -z "$1" ]; then printErr "" exit 1 fi -if [ -z "$2" ] - then +if [ -z "$2" ]; then printErr "" exit 1 fi +if [ -z "$3" ]; then + printErr "" + exit 1 +fi + TAG=$1 NODES=$2 +BRANCH=$3 # Check for AWS private key file (.pem file) if [ ! -f "pem/bigchaindb.pem" ] @@ -63,16 +68,29 @@ fab install_base_software fab install_rethinkdb # Rollout BigchainDB (but don't start it yet) -fab install_bigchaindb +if [ "$BRANCH" == "pypi" ]; then + fab install_bigchaindb_from_pypi +else + cd .. + rm -f bigchaindb-archive.tar.gz + git archive $BRANCH --format=tar --output=bigchaindb-archive.tar + # TODO: the archive could exclude more files besides the .gitignore ones + # such as the docs. See http://tinyurl.com/zo6fxeg + gzip bigchaindb-archive.tar + mv bigchaindb-archive.tar.gz deploy-cluster-aws + cd deploy-cluster-aws + fab install_bigchaindb_from_git_archive + rm bigchaindb-archive.tar.gz +fi # Configure BigchainDB on all nodes fab configure_bigchaindb -# TODO Get public keys from all nodes -# using e.g. bigchaindb export-pubkey +# TODO: Get public keys from all nodes + + +# TODO: Add list of public keys to keyring of all nodes -# TODO Add list of public keys to keyring of all nodes -# using e.g. bigchaindb import-pubkey # Send a "bigchaindb init" command to one node # to initialize the BigchainDB database From b9b7f0d9d41d66e406c8c104f0964738b9bc6700 Mon Sep 17 00:00:00 2001 From: troymc Date: Thu, 21 Apr 2016 16:36:59 +0200 Subject: [PATCH 02/16] Updated docs on installng to AWS (new arg for startup.sh) --- docs/source/deploy-on-aws.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/source/deploy-on-aws.md b/docs/source/deploy-on-aws.md index ebd73b4f..282863b7 100644 --- a/docs/source/deploy-on-aws.md +++ b/docs/source/deploy-on-aws.md @@ -85,14 +85,23 @@ Add some rules for Inbound traffic: ## Deployment -Here's an example of how one could launch a BigchainDB cluster of 4 nodes tagged `wrigley` on AWS: +Here's an example of how one could launch a BigchainDB cluster of four nodes tagged `wrigley` on AWS: ```text cd bigchaindb cd deploy-cluster-aws -./startup.sh wrigley 4 +./startup.sh wrigley 4 pypi ``` -`startup.sh` is a Bash script which calls some Python 2 and Fabric scripts. Here's what it does: +The `pypi` on the end means that it will install the latest (stable) `bigchaindb` package from the [Python Package Index (PyPI)](https://pypi.python.org/pypi). That is, on each instance, BigchainDB is installed using `pip install bigchaindb`. + +`startup.sh` is a Bash script which calls some Python and Fabric scripts. The usage is: +```text +./startup.sh +``` + +The first two arguments are self-explanatory. The third argument can be `pypi` or the name of a local Git branch (e.g. `master` or `feat/3752/quote-asimov-on-tuesdays`). + +Here's what the `startup.sh` script does; it: 0. allocates more elastic IP addresses if necessary, 1. launches the specified number of nodes (instances) on Amazon EC2, @@ -104,7 +113,7 @@ cd deploy-cluster-aws 7. installs base (prerequisite) software on all instances, 8. installs RethinkDB on all instances, 9. installs BigchainDB on all instances, -10. generates the genesis block, +10. initializes the BigchainDB database, 11. starts BigchainDB on all instances. It should take a few minutes for the deployment to finish. If you run into problems, see the section on Known Deployment Issues below. From e7483e8853144cc95f3aeca9dc3ccfa6ab1116e3 Mon Sep 17 00:00:00 2001 From: troymc Date: Thu, 21 Apr 2016 17:32:14 +0200 Subject: [PATCH 03/16] Added v0.1.5 and more to CHANGELOG.md --- CHANGELOG.md | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 291e89fd..94c875dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,19 +19,44 @@ Tag name: TBD committed: TBD ### Added -- AWS deployment scripts: [Issue #151](https://github.com/bigchaindb/bigchaindb/issues/151) -- `CHANGELOG.md` (this file) +- Ability to use environment variables to set (or partially set) configuration settings: [Pull Request #153](https://github.com/bigchaindb/bigchaindb/pull/153) +- `bigchaindb --export-my-pubkey`: [Pull Request #186](https://github.com/bigchaindb/bigchaindb/pull/186) +- `bigchaindb --version`, and one central source for the current version (`version.py`): [Pull Request #208](https://github.com/bigchaindb/bigchaindb/pull/208) +- AWS deployment scripts: Pull Requests +[#160](https://github.com/bigchaindb/bigchaindb/pull/160), +[#166](https://github.com/bigchaindb/bigchaindb/pull/166), +[#172](https://github.com/bigchaindb/bigchaindb/pull/172), +[#203](https://github.com/bigchaindb/bigchaindb/pull/203) +- `codecov.yml`: [Pull Request #161](https://github.com/bigchaindb/bigchaindb/pull/161) +- `CHANGELOG.md` (this file): [Pull Request #117](https://github.com/bigchaindb/bigchaindb/pull/117) +- Signatures using Ed25519: Pull Requests +[#138](https://github.com/bigchaindb/bigchaindb/pull/138), +[#152](https://github.com/bigchaindb/bigchaindb/pull/152) - Multisig support: [Pull Request #107](https://github.com/bigchaindb/bigchaindb/pull/107) -- API/Wire protocol (RESTful HTTP API): [Pull Request #102](https://github.com/bigchaindb/bigchaindb/pull/102) +- HTTP Server & Web API: Pull Requests +[#102](https://github.com/bigchaindb/bigchaindb/pull/102), +[#150](https://github.com/bigchaindb/bigchaindb/pull/150), +[#155](https://github.com/bigchaindb/bigchaindb/pull/155), +[#183](https://github.com/bigchaindb/bigchaindb/pull/183) - Python driver/SDK/API: [Pull Request #102](https://github.com/bigchaindb/bigchaindb/pull/102) - Python Style Guide: [Pull Request #89](https://github.com/bigchaindb/bigchaindb/pull/89) -- Monitoring & dashboard tools: [Pull Request #72](https://github.com/bigchaindb/bigchaindb/pull/72) +- Monitoring & dashboard tools: Pull Requests +[#72](https://github.com/bigchaindb/bigchaindb/pull/72), +[#181](https://github.com/bigchaindb/bigchaindb/pull/181) ### Changed -- Rewrote [`README.md`](https://github.com/bigchaindb/bigchaindb/blob/develop/README.md) into four sets of links: Pull Requests [#80](https://github.com/bigchaindb/bigchaindb/pull/80) and [#115](https://github.com/bigchaindb/bigchaindb/pull/115) +- Rewrote [`README.md`](README.md) into four sets of links: Pull Requests [#80](https://github.com/bigchaindb/bigchaindb/pull/80) and [#115](https://github.com/bigchaindb/bigchaindb/pull/115) ### Fixed - Bug related to config overwrite: [Pull Request #97](https://github.com/bigchaindb/bigchaindb/pull/97) + + +## [0.1.5] - 2016-04-20 +Tag name: v0.1.5 += commit: 9f62cddbaf44167692cfee71db707bce93e3395f +committed: April 20, 2016, 3:31 PM GMT+2 + +### Fixed - [Issue #71](https://github.com/bigchaindb/bigchaindb/issues/71) (Voter is not validating blocks correctly when checking for double spends) in [Pull Request #76](https://github.com/bigchaindb/bigchaindb/pull/76) From a6dd9dc1fd41dbb185455966ca86969fb2ebc9dc Mon Sep 17 00:00:00 2001 From: diminator Date: Fri, 22 Apr 2016 12:23:51 +0200 Subject: [PATCH 04/16] update to cryptoconditions 0.1.6: removes the need of the cryptography dependency --- bigchaindb/core.py | 4 ++-- bigchaindb/crypto.py | 4 ++-- bigchaindb/util.py | 2 +- docs/source/python-server-api-examples.md | 2 +- setup.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bigchaindb/core.py b/bigchaindb/core.py index 0683170b..74e53cf1 100644 --- a/bigchaindb/core.py +++ b/bigchaindb/core.py @@ -290,7 +290,7 @@ class Bigchain(object): # Calculate the hash of the new block block_data = util.serialize(block) block_hash = crypto.hash_data(block_data) - block_signature = crypto.SigningKey(self.me_private).sign(block_data).decode() + block_signature = crypto.SigningKey(self.me_private).sign(block_data) block = { 'id': block_hash, @@ -409,7 +409,7 @@ class Bigchain(object): } vote_data = util.serialize(vote) - signature = crypto.SigningKey(self.me_private).sign(vote_data).decode() + signature = crypto.SigningKey(self.me_private).sign(vote_data) vote_signed = { 'node_pubkey': self.me, diff --git a/bigchaindb/crypto.py b/bigchaindb/crypto.py index 506cb00e..bdd6aaaa 100644 --- a/bigchaindb/crypto.py +++ b/bigchaindb/crypto.py @@ -13,5 +13,5 @@ def generate_key_pair(): sk, pk = ed25519.ed25519_generate_key_pair() return sk.decode(), pk.decode() -SigningKey = ed25519.Ed25519SigningKey -VerifyingKey = ed25519.Ed25519VerifyingKey +SigningKey = ed25519.SigningKey +VerifyingKey = ed25519.VerifyingKey diff --git a/bigchaindb/util.py b/bigchaindb/util.py index 165c2de7..f07a4a80 100644 --- a/bigchaindb/util.py +++ b/bigchaindb/util.py @@ -219,7 +219,7 @@ def sign_tx(transaction, private_key): private_key = crypto.SigningKey(private_key) signature = private_key.sign(serialize(transaction)) signed_transaction = transaction.copy() - signed_transaction.update({'signature': signature.decode()}) + signed_transaction.update({'signature': signature}) return signed_transaction diff --git a/docs/source/python-server-api-examples.md b/docs/source/python-server-api-examples.md index 2b2bfd86..d7e01d9b 100644 --- a/docs/source/python-server-api-examples.md +++ b/docs/source/python-server-api-examples.md @@ -69,7 +69,7 @@ After a couple of seconds, we can check if the transactions was included in the # retrieve a transaction from the bigchain tx_retrieved = b.get_transaction(tx_signed['id']) - 'id': '6539dded9479c47b3c83385ae569ecaa90bcf387240d1ee2ea3ae0f7986aeddd', +{ 'id': '6539dded9479c47b3c83385ae569ecaa90bcf387240d1ee2ea3ae0f7986aeddd', 'transaction': { 'current_owner': 'pvGtcm5dvwWMzCqagki1N6CDKYs2J1cCwTNw8CqJic3Q', 'data': { 'hash': '872fa6e6f46246cd44afdb2ee9cfae0e72885fb0910e2bcf9a5a2a4eadb417b8', 'payload': {'msg': 'Hello BigchainDB!'}}, diff --git a/setup.py b/setup.py index fd63eb0c..77e3a02d 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ setup( 'rethinkdb==2.2.0.post4', 'pysha3==0.3', 'pytz==2015.7', - 'cryptoconditions==0.1.1', + 'cryptoconditions==0.1.6', 'statsd==3.2.1', 'python-rapidjson==0.0.6', 'logstats==0.2.1', From 99b2dd2a618d2f9f890c289f9ad2a7f4a36d0083 Mon Sep 17 00:00:00 2001 From: diminator Date: Fri, 22 Apr 2016 12:50:05 +0200 Subject: [PATCH 05/16] removing libffi-dev and libssl-dev from distro dependencies (only required for cryptography, which was removed) (cherry picked from commit 11d1482790ac20983a5e7b5145b5487c70694e84) --- docs/source/installing-server.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/installing-server.md b/docs/source/installing-server.md index f591ff5c..8aff2169 100644 --- a/docs/source/installing-server.md +++ b/docs/source/installing-server.md @@ -31,13 +31,13 @@ BigchainDB Server has some OS-level dependencies. In particular, you need to ins On Ubuntu 14.04, we found that the following was enough: ```text $ sudo apt-get update -$ sudo apt-get install libffi-dev g++ libssl-dev python3-dev +$ sudo apt-get install g++ python3-dev ``` On Fedora 23, we found that the following was enough (tested in February 2015): ```text $ sudo dnf update -$ sudo dnf install libffi-devel gcc-c++ redhat-rpm-config python3-devel openssl-devel +$ sudo dnf install gcc-c++ redhat-rpm-config python3-devel ``` (If you're using a version of Fedora before version 22, you may have to use `yum` instead of `dnf`.) From 6fb6138fae65cdce5b83adeda6438f82b37054c6 Mon Sep 17 00:00:00 2001 From: diminator Date: Fri, 22 Apr 2016 12:41:00 +0200 Subject: [PATCH 06/16] removed cryptography refs from docs --- docs/source/installing-server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/installing-server.md b/docs/source/installing-server.md index 8aff2169..e1465b98 100644 --- a/docs/source/installing-server.md +++ b/docs/source/installing-server.md @@ -26,7 +26,7 @@ If you don't already have it, then you should [install Python 3.4+](https://www. ## Install BigchainDB Server -BigchainDB Server has some OS-level dependencies. In particular, you need to install the OS-level dependencies for the Python **cryptography** package. Instructions for installing those dependencies on your OS can be found in the [cryptography package documentation](https://cryptography.io/en/latest/installation/). +BigchainDB Server has some OS-level dependencies. On Ubuntu 14.04, we found that the following was enough: ```text From bbdfc7fc79f76d803347463a4245a1ed544a842e Mon Sep 17 00:00:00 2001 From: troymc Date: Mon, 25 Apr 2016 09:06:28 +0200 Subject: [PATCH 07/16] Added External Contributors in CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c875dc..5418584d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ For reference, the possible headings are: * **Removed** for deprecated features removed in this release. * **Fixed** for any bug fixes. * **Security** to invite users to upgrade in case of vulnerabilities. +* **External Contributors** to list contributors outside of ascribe GmbH. ## [Unreleased] - YYYY-MM-DD @@ -50,6 +51,12 @@ committed: TBD ### Fixed - Bug related to config overwrite: [Pull Request #97](https://github.com/bigchaindb/bigchaindb/pull/97) +## External Contributors +- [@thedoctor](https://github.com/thedoctor): Pull Requests +[#99](https://github.com/bigchaindb/bigchaindb/pull/99), +[#136](https://github.com/bigchaindb/bigchaindb/pull/136) +- [@roderik](https://github.com/roderik): [Pull Request #162](https://github.com/bigchaindb/bigchaindb/pull/162) + ## [0.1.5] - 2016-04-20 Tag name: v0.1.5 From 35db72e871490d6b21ba081c34928529124d07eb Mon Sep 17 00:00:00 2001 From: troymc Date: Mon, 25 Apr 2016 13:19:23 +0200 Subject: [PATCH 08/16] Made branch=pypi the default for startup.sh --- deploy-cluster-aws/startup.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/deploy-cluster-aws/startup.sh b/deploy-cluster-aws/startup.sh index 89d3e773..58fca6d5 100755 --- a/deploy-cluster-aws/startup.sh +++ b/deploy-cluster-aws/startup.sh @@ -20,20 +20,22 @@ if [ -z "$2" ]; then exit 1 fi -if [ -z "$3" ]; then - printErr "" - exit 1 -fi - TAG=$1 NODES=$2 -BRANCH=$3 + +# If they don't include a third argument () +# then assume BRANCH = "pypi" by default +if [ -z "$3" ]; then + echo "No third argument was specified, so BigchainDB will be installed from PyPI" + BRANCH="pypi" +else + BRANCH=$3 +fi # Check for AWS private key file (.pem file) -if [ ! -f "pem/bigchaindb.pem" ] - then - echo "File pem/bigchaindb.pem (AWS private key) is missing" - exit 1 +if [ ! -f "pem/bigchaindb.pem" ]; then + echo "File pem/bigchaindb.pem (AWS private key) is missing" + exit 1 fi # Change the file permissions on pem/bigchaindb.pem From c7b4b698c3f639528708657e0e7473190b74853a Mon Sep 17 00:00:00 2001 From: troymc Date: Mon, 25 Apr 2016 13:22:56 +0200 Subject: [PATCH 09/16] Updated docs on startup.sh --- docs/source/deploy-on-aws.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/deploy-on-aws.md b/docs/source/deploy-on-aws.md index 282863b7..4a373a0d 100644 --- a/docs/source/deploy-on-aws.md +++ b/docs/source/deploy-on-aws.md @@ -99,7 +99,7 @@ The `pypi` on the end means that it will install the latest (stable) `bigchaindb ./startup.sh ``` -The first two arguments are self-explanatory. The third argument can be `pypi` or the name of a local Git branch (e.g. `master` or `feat/3752/quote-asimov-on-tuesdays`). +The first two arguments are self-explanatory. The third argument can be `pypi` or the name of a local Git branch (e.g. `master` or `feat/3752/quote-asimov-on-tuesdays`). If you don't include a third argument, then `pypi` will be assumed by default. Here's what the `startup.sh` script does; it: From 423acf406900d0386715f8948c63753f422dbdf5 Mon Sep 17 00:00:00 2001 From: troymc Date: Mon, 25 Apr 2016 13:23:45 +0200 Subject: [PATCH 10/16] Changed pip install to pip3 install in fabfile.py --- deploy-cluster-aws/fabfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy-cluster-aws/fabfile.py b/deploy-cluster-aws/fabfile.py index ec4869da..0d39161e 100644 --- a/deploy-cluster-aws/fabfile.py +++ b/deploy-cluster-aws/fabfile.py @@ -117,7 +117,7 @@ def install_rethinkdb(): @task @parallel def install_bigchaindb_from_pypi(): - sudo('pip install bigchaindb') + sudo('pip3 install bigchaindb') # Install BigchainDB from a Git archive file @@ -127,7 +127,7 @@ def install_bigchaindb_from_pypi(): def install_bigchaindb_from_git_archive(): put('bigchaindb-archive.tar.gz') run('tar xvfz bigchaindb-archive.tar.gz') - sudo('pip install .') + sudo('pip3 install .') # sudo('python3 setup.py install') From 7e7f266082477b3ff7e4144e88741e44c6ad4af9 Mon Sep 17 00:00:00 2001 From: troymc Date: Mon, 25 Apr 2016 13:24:50 +0200 Subject: [PATCH 11/16] No more apt-get install libssl-dev libffi-dev in fabfile --- deploy-cluster-aws/fabfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy-cluster-aws/fabfile.py b/deploy-cluster-aws/fabfile.py index 0d39161e..82198642 100644 --- a/deploy-cluster-aws/fabfile.py +++ b/deploy-cluster-aws/fabfile.py @@ -64,8 +64,8 @@ def install_base_software(): sudo('dpkg --configure -a') sudo('apt-get -y -f install') sudo('apt-get -y install build-essential wget bzip2 ca-certificates \ - libglib2.0-0 libxext6 libsm6 libxrender1 libssl-dev \ - git gcc g++ python3-dev libboost-python-dev libffi-dev \ + libglib2.0-0 libxext6 libsm6 libxrender1 \ + git gcc g++ python3-dev libboost-python-dev \ software-properties-common python-software-properties \ python3-setuptools ipython3 sysstat s3cmd') sudo('easy_install3 pip') From dcce6d9504abd06551f0c59ea1d5c5000567f1e9 Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Mon, 25 Apr 2016 13:39:28 +0200 Subject: [PATCH 12/16] returns empty list. not None --- bigchaindb/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigchaindb/core.py b/bigchaindb/core.py index 74e53cf1..f9e3e1d2 100644 --- a/bigchaindb/core.py +++ b/bigchaindb/core.py @@ -171,7 +171,7 @@ class Bigchain(object): Returns: A list of transactions containing that payload. If no transaction exists with that payload it - returns `None` + returns an empty list `[]` """ cursor = r.table('bigchain')\ From 1b54a9ca6f557dc76d1a54d653f8df2495b5fe22 Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Tue, 26 Apr 2016 10:45:05 +0200 Subject: [PATCH 13/16] run the loader inside a running container --- docker-compose.yml | 1 + docs/source/installing-server.md | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0cce5cda..b8e5a116 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ rethinkdb-data: bigchaindb: build: . + container_name: docker-bigchaindb volumes: - ./bigchaindb:/usr/src/app/bigchaindb - ./tests:/usr/src/app/tests diff --git a/docs/source/installing-server.md b/docs/source/installing-server.md index e1465b98..2fbf77aa 100644 --- a/docs/source/installing-server.md +++ b/docs/source/installing-server.md @@ -135,7 +135,7 @@ API Server bind? (default `localhost:9984`): Database host? (default `localhost`): rethinkdb Database port? (default `28015`): Database name? (default `bigchain`): -Statsd host? (default `localhost`): statsd +Statsd host? (default `localhost`): Statsd port? (default `8125`): Statsd rate? (default `0.01`): Ready to go! @@ -152,7 +152,7 @@ $ docker-compose up -d then you can load test transactions via: ```text -$ docker-compose run --rm bigchaindb bigchaindb-benchmark load +$ docker exec -it docker-bigchaindb bigchaindb-benchmark load -m ``` If you're on Linux, you can probably view the RethinkDB dashboard at: From 9143003b1ea8aca8b97311a46e4a2d54af619fd1 Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Tue, 26 Apr 2016 11:06:46 +0200 Subject: [PATCH 14/16] Updated version number and changelog --- CHANGELOG.md | 3 ++- bigchaindb/version.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5418584d..a0e02a75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ For reference, the possible headings are: * **External Contributors** to list contributors outside of ascribe GmbH. -## [Unreleased] - YYYY-MM-DD +## [0.2.0] - 2016-04-26 Tag name: TBD = commit: TBD committed: TBD @@ -50,6 +50,7 @@ committed: TBD ### Fixed - Bug related to config overwrite: [Pull Request #97](https://github.com/bigchaindb/bigchaindb/pull/97) +- Bug related to running the `bigchaindb-benchmark load` on docker [Pull Request #225](https://github.com/bigchaindb/bigchaindb/pull/225) ## External Contributors - [@thedoctor](https://github.com/thedoctor): Pull Requests diff --git a/bigchaindb/version.py b/bigchaindb/version.py index 8902322a..32cbd688 100644 --- a/bigchaindb/version.py +++ b/bigchaindb/version.py @@ -1,2 +1,2 @@ -__version__ = '0.1.5' +__version__ = '0.2.0' __short_version__ = '0.1' \ No newline at end of file From 0c4a2b380aabdcf50fa2d7fb351c290aaedc3db7 Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Tue, 26 Apr 2016 11:09:55 +0200 Subject: [PATCH 15/16] bump short version --- bigchaindb/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bigchaindb/version.py b/bigchaindb/version.py index 32cbd688..3af9f911 100644 --- a/bigchaindb/version.py +++ b/bigchaindb/version.py @@ -1,2 +1,2 @@ __version__ = '0.2.0' -__short_version__ = '0.1' \ No newline at end of file +__short_version__ = '0.2' \ No newline at end of file From 267d73b1cfe34bc1c43f5194e5c66a6d80a24dc8 Mon Sep 17 00:00:00 2001 From: Rodolphe Marques Date: Tue, 26 Apr 2016 11:19:04 +0200 Subject: [PATCH 16/16] added commit tag to changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0e02a75..e4f44483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,9 +15,9 @@ For reference, the possible headings are: ## [0.2.0] - 2016-04-26 -Tag name: TBD -= commit: TBD -committed: TBD +Tag name: v0.2.0 += commit: 0c4a2b380aabdcf50fa2d7fb351c290aaedc3db7 +committed: April 26, 2016, 11:09 AM GMT+2 ### Added - Ability to use environment variables to set (or partially set) configuration settings: [Pull Request #153](https://github.com/bigchaindb/bigchaindb/pull/153)