Merge pull request #2 from arturgontijo/master

[docker volume] Using docker volume to secure etcd

Author: arturgontijo

Dockerfile

@@ -6,34 +6,23 @@ RUN mkdir -p ${SINGNET_REPOS}
 
 RUN apt-get update && \
     apt-get install -y \
-    apt-utils \
     nano \
     git \
-    wget \
-    curl \
-    zip \
-    libudev-dev \
-    libusb-1.0-0-dev
+    wget
 
-RUN apt-get install -y nodejs npm
 RUN apt-get install -y python3 python3-pip
 
-RUN cd ${SINGNET_REPOS} && \
-    git clone https://github.com/singnet/snet-cli && \
-    cd snet-cli && \
-    ./scripts/blockchain install && \
-    pip3 install -e .
-
 RUN cd ${SINGNET_REPOS} && \
     mkdir snet-daemon && \
     cd snet-daemon && \
-    wget https://github.com/singnet/snet-daemon/releases/download/v0.1.3/snetd-0.1.3.tar.gz && \
-    tar -xvf snetd-0.1.3.tar.gz && \
-    mv linux-amd64/snetd /usr/bin/snetd
+    wget https://github.com/singnet/snet-daemon/releases/download/v0.1.4/snetd-0.1.4.tar.gz && \
+    tar -xvf snetd-0.1.4.tar.gz && \
+    mv snetd-0.1.4/snetd-linux-amd64 /usr/bin/snetd
 
 RUN cd ${SINGNET_REPOS} && \
     git clone https://github.com/singnet/example-service.git && \
     cd example-service && \
+    pip3 install -r requirements.txt && \
     sh buildproto.sh
 
 WORKDIR ${SINGNET_REPOS}/example-service

README.md

@@ -46,23 +46,21 @@ $ python3 test_example_service.py
 
 ##### SingularityNET Daemon Configuration
 
-Now you must follow the [howToPublishService](https://github.com/singnet/wiki/tree/master/tutorials/howToPublishService)
-tutorial to publish this service and set the `snetd.config.json` file.
+To get the `ORGANIZATION_ID` and `SERVICE_ID` you must have already published a service 
+(check this [link](https://dev.singularitynet.io/tutorials/publish/)).
 
-Then, be sure that you have the `snetd` in your PATH.
-
-Create the `snetd.config.json` file using this template:
+Create the `SNET Daemon`'s config JSON file (`snetd.config.json`).
 
 ```
 {
    "DAEMON_END_POINT": "http://DAEMON_HOST:DAEMON_PORT",
    "ETHEREUM_JSON_RPC_ENDPOINT": "https://kovan.infura.io",
    "IPFS_END_POINT": "http://ipfs.singularitynet.io:80",
-   "REGISTRY_ADDRESS_KEY": "0x2e4b2f2b72402b9b2d6a7851e37c856c329afe38",
+   "REGISTRY_ADDRESS_KEY": "0xe331bf20044a5b24c1a744abc90c1fd711d2c08d",
    "PASSTHROUGH_ENABLED": true,
-   "PASSTHROUGH_ENDPOINT": "http://SERVICE_GRPC_HOST:SERVICE_GRPC_PORT",  
-   "ORGANIZATION_NAME": "ORGANIZATION_NAME",
-   "SERVICE_NAME": "SERVICE_NAME",
+   "PASSTHROUGH_ENDPOINT": "http://SERVICE_GRPC_HOST:SERVICE_GRPC_PORT",
+   "ORGANIZATION_ID": "ORGANIZATION_ID",
+   "SERVICE_ID": "SERVICE_ID",
    "LOG": {
        "LEVEL": "debug",
        "OUTPUT": {
@@ -76,8 +74,8 @@ For example, replace tags with:
 
 - `http://DAEMON_HOST:DAEMON_PORT`: http://localhost:7000
 - `http://SERVICE_GRPC_HOST:SERVICE_GRPC_PORT`: http://localhost:7003
-- `ORGANIZATION_NAME`: example-organization
-- `SERVICE_NAME`: example-service
+- `ORGANIZATION_ID`: example-organization
+- `SERVICE_ID`: example-service
 
 See [SingularityNet daemon configuration](https://github.com/singnet/snet-daemon/blob/master/README.md#configuration) for detailed configuration description.
 
@@ -95,14 +93,35 @@ $ python3 run_example_service.py
 
 ```
 $ docker build -t snet_example_service https://github.com/singnet/example-service.git#master
-$ docker run -p 7000:7000 -ti snet_example_service bash
+$ export ETCD_HOST_FOLDER=$HOME/singnet/etcd/example-service/
+$ export ETCD_CONTAINER_FOLDER=/opt/singnet/example-service/storage-data-dir-1.etcd/
+$ docker run -p 7000:7000 -v $ETCD_HOST_FOLDER:$ETCD_CONTAINER_FOLDER -ti snet_example_service bash
 ```
 
+Note that the `$ETCD_(HOST|CONTAINER)_FOLDER` are useful to keep your service's etcd folder outside the container.
+
 From this point we follow the tutorial in the Docker Container's prompt.
 
-After this, run the service (with `SNET Daemon`):
+After this, run the service (with `SNET Daemon`), make sure you have the `snetd.config.json` file in the service folder:
 
 ```
+# cat snetd.config.json
+{
+   "DAEMON_END_POINT": "http://localhost:7000",
+   "ETHEREUM_JSON_RPC_ENDPOINT": "https://kovan.infura.io",
+   "IPFS_END_POINT": "http://ipfs.singularitynet.io:80",
+   "REGISTRY_ADDRESS_KEY": "0xe331bf20044a5b24c1a744abc90c1fd711d2c08d",
+   "PASSTHROUGH_ENABLED": true,
+   "PASSTHROUGH_ENDPOINT": "http://localhost:7003",
+   "ORGANIZATION_ID": "example-organization",
+   "SERVICE_ID": "example-service",
+   "LOG": {
+       "LEVEL": "debug",
+       "OUTPUT": {
+            "TYPE": "stdout"
+           }
+   }
+}
 # python3 run_example_service.py &
 ```
 

buildproto.sh

@@ -1,2 +1,2 @@
 #! /bin/bash
-python3.6 -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. service/service_spec/example_service.proto
+python3 -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. service/service_spec/example_service.proto

test_example_service.py

@@ -27,21 +27,18 @@
         # Open a gRPC channel
         channel = grpc.insecure_channel("{}".format(endpoint))
         stub = grpc_ex_grpc.CalculatorStub(channel)
+        number = grpc_ex_pb2.Numbers(a=a, b=b)
 
         if grpc_method == "add":
-            number = grpc_ex_pb2.Numbers(a=a, b=b)
             response = stub.add(number)
             print(response.value)
         elif grpc_method == "sub":
-            number = grpc_ex_pb2.Numbers(a=a, b=b)
             response = stub.sub(number)
             print(response.value)
         elif grpc_method == "mul":
-            number = grpc_ex_pb2.Numbers(a=a, b=b)
             response = stub.mul(number)
             print(response.value)
         elif grpc_method == "div":
-            number = grpc_ex_pb2.Numbers(a=a, b=b)
             response = stub.div(number)
             print(response.value)
         else: