Support docker-compose for example test purpose.

.env

@@ -0,0 +1,2 @@
+IROHA_IMG=iroha-pi
+COMPOSE_PROJECT_NAME=iroha

.gitignore

@@ -81,7 +81,6 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
 .venv
 env/
 venv/

Makefile

@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY: all test
+.PHONY: all up down logs test
+
+IROHA_IMG := $(shell grep IROHA_IMG .env | cut -d"=" -f2)
+COMPOSE_PROJECT_NAME := $(shell grep COMPOSE_PROJECT_NAME example/.env | cut -d'=' -f2)
 
 UKERNEL := $(shell uname -s)
 UMACHINE := $(shell uname -m)
@@ -21,16 +24,19 @@ ifeq ($(UKERNEL),Linux)
   ifeq ($(UMACHINE),x86_64)
     PROJECT := hyperledger
     DOCKER := Dockerfile
+    COMPOSE := docker-compose.yml
   endif
   ifeq ($(UMACHINE),armv7l)
     PROJECT := arm32v7
     DOCKER := Dockerfile.arm32v7
+    COMPOSE := docker-compose-arm32v7.yml
   endif
 endif
 
 ifeq ($(UKERNEL),Darwin)
   PROJECT := hyperledger
   DOCKER := Dockerfile
+  COMPOSE := docker-compose.yml
 endif
 
 ifeq ($(DOCKER), )
@@ -40,5 +46,50 @@ endif
 all:
 	cd docker; docker build --rm -t $(PROJECT)/irohac -f $(DOCKER) .
 
+help:
+	@echo "help          - show make targets"
+	@echo "all (default) - buid iroha-dev container, and build iroha"
+	@echo "up            - running iroha container by docker-compose"
+	@echo "down          - stop and remove iroha container by docker-compose"
+	@echo "logs          - show logs of iroha_node_1 container"
+	@echo "test          - exec test commands"
+	@echo "up4           - running iroha container by docker-compose (4 nodes)"
+	@echo "down4         - stop and remove iroha container by docker-compose (4 nodes)"
+	@echo "logs4         - show logs of iroha_node_1 container (4 nodes)"
+	@echo "up7           - running iroha container by docker-compose (7 nodes)"
+	@echo "down7         - stop and remove iroha container by docker-compose (7 nodes)"
+	@echo "logs7         - show logs of iroha_node_1 container (7 nodes)"
+	@echo "version       - show labels in container"
+
+up:
+	cd example; docker-compose -p $(COMPOSE_PROJECT_NAME) -f $(COMPOSE) up -d
+
+down:
+	cd example; docker-compose -p $(COMPOSE_PROJECT_NAME)  -f $(COMPOSE) down
+
+up4:
+	cd example/node4; docker-compose -p $(COMPOSE_PROJECT_NAME) -f $(COMPOSE) up -d
+
+up7:
+	cd example/node7; docker-compose -p $(COMPOSE_PROJECT_NAME) -f $(COMPOSE) up -d
+
+down4:
+	cd example/node4; docker-compose -p $(COMPOSE_PROJECT_NAME)  -f $(COMPOSE) down
+
+down7:
+	cd example/node7; docker-compose -p $(COMPOSE_PROJECT_NAME)  -f $(COMPOSE) down
+
+logs:
+	docker logs -f iroha_node_1
+
+logs4:
+	cd example/node4; bash logs4.sh
+
+logs7:
+	cd example/node7; bash logs7.sh
+
 test:
 	cd example; bash test.sh
+
+version:
+	docker inspect -f {{.Config.Labels}} $(PROJECT)/$(IROHA_IMG)

example/.env

@@ -0,0 +1 @@
+../.env

example/.gitignore

@@ -0,0 +1,4 @@
+!.env
+/block_store/
+alice@*
+bob@*

example/admin@test

@@ -1 +1 @@
-4209ba343a92f4d086921a3f3c1eb26f50f2fece610ec3524058de79281564c2
+1d7e0a32ee0affeb4d22acd73c2c6fb6bd58e266c8c2ce4fa0ffe3dd6a253ffb

example/admin@test.pub

@@ -1 +1 @@
-359f925e4eeecfdd6aa1abc0b79a6a121a5dd63bb612b603247ea4f8ad160156
+407e57f50ca48969b08ba948171bb2435e035d82cec417e18e4a38f5fb113f83

example/docker-compose-arm32v7.yml

@@ -0,0 +1,41 @@
+# Copyright Takeshi Yonezu. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+version: '3'
+
+services:
+  node:
+    image: arm32v7/${IROHA_IMG}
+    ports:
+      - "50051:50051"
+    environment:
+      - CCACHE_DIR=/tmp/ccache
+    volumes:
+      - .:/opt/iroha/config
+      - ./block_store:/tmp/block_store
+      - ccache-data:/tmp/ccache
+    working_dir: /opt/iroha
+    command: >
+      bash -c "sleep 30;
+      /opt/iroha/bin/irohad --config config/iroha.conf
+      --genesis_block config/genesis.block
+      --keypair_name config/node0"
+    depends_on:
+      - redis
+      - postgres
+
+  postgres:
+    image: arm32v7/postgres:9.5
+    environment:
+      - POSTGRES_USER=iroha
+      - POSTGRES_PASSWORD=HelloW0rld
+    depends_on:
+      - redis
+
+  redis:
+    image: arm32v7/redis
+
+volumes:
+  ccache-data:

example/docker-compose.yml

@@ -0,0 +1,41 @@
+# Copyright Takeshi Yonezu. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+version: '3'
+
+services:
+  node:
+    image: hyperledger/${IROHA_IMG}
+    ports:
+      - "50051:50051"
+    environment:
+      - CCACHE_DIR=/tmp/ccache
+    volumes:
+      - .:/opt/iroha/config
+      - ./block_store:/tmp/block_store
+      - ccache-data:/tmp/ccache
+    working_dir: /opt/iroha
+    command: >
+      bash -c "sleep 5;
+      /opt/iroha/bin/irohad --config config/iroha.conf
+      --genesis_block config/genesis.block
+      --keypair_name config/node0"
+    depends_on:
+      - redis
+      - postgres
+
+  postgres:
+    image: postgres:9.5
+    environment:
+      - POSTGRES_USER=iroha
+      - POSTGRES_PASSWORD=HelloW0rld
+    depends_on:
+      - redis
+
+  redis:
+    image: redis:3.2.8
+
+volumes:
+  ccache-data:

example/genesis.block

@@ -0,0 +1,107 @@
+{
+    "signatures": [],
+    "created_ts": 0,
+    "hash": "bf6edb882d53f5532cb416455834878db7af08fb814f8c95d6867a6d9eea4057",
+    "prev_hash": "0000000000000000000000000000000000000000000000000000000000000000",
+    "height": 1,
+    "txs_number": 1,
+    "transactions": [
+        {
+            "signatures": [],
+            "created_ts": 0,
+            "creator_account_id": "",
+            "tx_counter": 0,
+            "commands": [
+                {
+                    "command_type": "AddPeer",
+                    "address": "localhost:10001",
+                    "peer_key": "292a8714694095edce6be799398ed5d6244cd7be37eb813106b217d850d261f2"
+                },
+                {
+                    "command_type": "CreateRole",
+                    "role_name": "admin",
+                    "permissions": [
+                        "CanAddPeer",
+                        "CanAddSignatory",
+                        "CanCreateAccount",
+                        "CanCreateDomain",
+                        "CanGetAllAccountAssets",
+                        "CanGetAllAccountAssetsTransactions",
+                        "CanGetAllAccountTransactions",
+                        "CanGetAllAccounts",
+                        "CanGetAllSignatories",
+                        "CanGetRoles",
+                        "CanReadAssets",
+                        "CanRemoveSignatory",
+                        "CanSetQuorum",
+			"CanAddAssetQuantity"
+                    ]
+                },
+                {
+                    "command_type": "CreateRole",
+                    "role_name": "user",
+                    "permissions": [
+                        "CanAddSignatory",
+                        "CanGetMyAccount",
+                        "CanGetMyAccountAssets",
+                        "CanGetMyAccountAssetsTransactions",
+                        "CanGetMyAccountTransactions",
+                        "CanGetMySignatories",
+                        "CanGrantCanAddSignatory",
+                        "CanGrantCanRemoveSignatory",
+                        "CanGrantCanSetAccountInfo",
+                        "CanGrantCanSetQuorum",
+                        "CanGrantCanTransfer",
+                        "CanReceive",
+                        "CanRemoveSignatory",
+                        "CanSetQuorum",
+                        "CanTransfer"
+                    ]
+                },
+                {
+                    "command_type": "CreateRole",
+                    "role_name": "money_creator",
+                    "permissions": [
+                        "CanAddAssetQuantity",
+                        "CanCreateAsset",
+                        "CanReceive",
+                        "CanTransfer"
+                    ]
+                },
+                {
+                    "command_type": "CreateDomain",
+                    "domain_id": "test",
+                    "user_default_role": "user"
+                },
+                {
+                    "command_type": "CreateAsset",
+                    "asset_name": "coin",
+                    "domain_id": "test",
+                    "precision": 2
+                },
+                {
+                    "command_type": "CreateAccount",
+                    "account_name": "admin",
+                    "domain_id": "test",
+                    "pubkey": "407e57f50ca48969b08ba948171bb2435e035d82cec417e18e4a38f5fb113f83"
+                },
+                {
+                    "command_type": "CreateAccount",
+                    "account_name": "test",
+                    "domain_id": "test",
+                    "pubkey": "359f925e4eeecfdd6aa1abc0b79a6a121a5dd63bb612b603247ea4f8ad160156"
+                },
+                {
+                    "command_type": "AppendRole",
+                    "account_id": "admin@test",
+                    "role_name": "admin"
+                },
+                {
+                    "command_type": "AppendRole",
+                    "account_id": "admin@test",
+                    "role_name": "money_creator"
+                }
+            ]
+        }
+    ]
+}