Move the mywork directory used by Fabric proxy model

Signed-off-by: ikegawa-koshi <[email protected]>

Author: ikegawa-koshi

.gitignore

@@ -65,6 +65,7 @@ examples/common/java/*/*/build/
 .settings
 .springBeans
 .sts4-cache
+.sealed/
 
 ### IntelliJ IDEA ###
 .idea
@@ -88,3 +89,7 @@ examples/common/java/*/bin/
 
 # Fabric certificates folder
 vars/
+
+# TestingFabricProxyModel.rst
+mywork/
+

docker/compose/avalon-fabric.yaml

@@ -18,8 +18,8 @@ services:
   avalon-shell:
     volumes:
       # Below files are generated by minifab in ~/mywork/vars/
-      - ~/mywork/vars/keyfiles:/keyfiles
-      - ~/mywork/vars/profiles/mychannel_network_for_pysdk.json:/project/avalon/sdk/avalon_sdk/connector/blockchains/fabric/network.json
+      - ./mywork/vars/keyfiles:/keyfiles
+      - ./mywork/vars/profiles/mychannel_network_for_pysdk.json:/project/avalon/sdk/avalon_sdk/connector/blockchains/fabric/network.json
     environment:
       - http_proxy
       - https_proxy
@@ -53,8 +53,8 @@ services:
     volumes:
       # Fabric crypto materials has to be shared with connector to
       # interact with fabric blockchain
-      - ~/mywork/vars/keyfiles:/keyfiles
-      - ~/mywork/vars/profiles/mychannel_network_for_pysdk.json:/project/avalon/sdk/avalon_sdk/connector/blockchains/fabric/network.json
+      - ./mywork/vars/keyfiles:/keyfiles
+      - ./mywork/vars/profiles/mychannel_network_for_pysdk.json:/project/avalon/sdk/avalon_sdk/connector/blockchains/fabric/network.json
     depends_on:
       - avalon-listener
       - avalon-enclave-manager

docs/TestingFabricProxyModel.rst

@@ -59,13 +59,13 @@ follow these steps:
 
    .. code:: sh
 
-       docker-compose -f docker-compose.yaml -f docker/compose/avalon-fabric.yaml up -d --build
+       sudo docker-compose -f docker-compose.yaml -f docker/compose/avalon-fabric.yaml up -d --build
 
    To start a worker pool (with one Key Management Enclave and one Work order Processing Enclave):
 
    .. code:: sh
 
-       docker-compose -f docker-compose.yaml -f docker/compose/avalon-pool.yaml -f docker/compose/avalon-fabric.yaml up -d --build
+       sudo docker-compose -f docker-compose.yaml -f docker/compose/avalon-pool.yaml -f docker/compose/avalon-fabric.yaml up -d --build
 
    To run in Intel SGX hardware mode, use the corresponding docker compose file for singleton or worker pool mode (as specified in `BUILD.md <../BUILD.md>`_).
 
@@ -104,6 +104,7 @@ requires below changes.
    the Avalon chaincodes which are located in (https://github.com/hyperledger/avalon/tree/master/sdk/avalon_sdk/connector/blockchains/fabric/chaincode)
 
    .. code:: sh
+
         cd $TCF_HOME
         ./scripts/start_fabric.sh -e
 
@@ -113,7 +114,8 @@ requires below changes.
    Avalon shell and Avalon fabric connector need these crypto materials to interact with the blockchain.
 
    .. code:: sh
-        scp -r ~/mywork <user_name>@<IP1>:~/
+
+        scp -r $TCF_HOME/mywork <user_name>@<IP1>:~/
 
 3. If you choose the customized setup other than the start_fabric.sh (minifab) then create the network.json as in (https://github.com/hyperledger/avalon/blob/master/sdk/avalon_sdk/connector/blockchains/fabric/network.json)
 
@@ -125,11 +127,13 @@ requires below changes.
 6. Start the Avalon components.
 
    .. code:: sh
+
         docker-compose -f docker-compose.yaml -f docker/compose/avalon-fabric.yaml up -d --build
 
    To start a worker pool (with one Key Management Enclave and one Work order Processing Enclave):
 
    .. code:: sh
+
         docker-compose -f docker-compose.yaml -f docker/compose/avalon-pool.yaml -f docker/compose/avalon-fabric.yaml up -d --build
 
    To run in Intel SGX hardware mode, use the corresponding Docker compose file for singleton or worker pool mode (as specified in BUILD.md).
@@ -138,6 +142,7 @@ requires below changes.
    Go to the avalon-shell container to run generic_client.py
 
    .. code:: sh
+
         docker exec -it  avalon-shell bash
         cd examples/apps/generic_client/
         ./generic_client.py -b fabric --workload_id "echo-result" --in_data "Hello" -o \
@@ -156,8 +161,8 @@ Troubleshooting
 
          ./scripts/start_fabric.sh -c
 
-     This runs ``~/mywork/minifab cleanup`` and
-     removes directory ``~/mywork/vars``
+     This runs ``$TCF_HOME/mywork/minifab cleanup`` and
+     removes directory ``$TCF_HOME/mywork/vars``
   2. Verify Fabric Docker service containers are down with ``docker ps -a``
   3. To remove containers that exited but are not removed, type:
 
@@ -166,7 +171,7 @@ Troubleshooting
          docker rm $(docker ps -aq -f status=exited)
 
   4. Remove the Fabric work directory and minifab:
-     ``rm -rf ~/mywork``
+     ``rm -rf $TCF_HOME/mywork``
   5. Optional. To remove the Avalon directory type:
      ``cd; rm -rf $TCF_HOME``
 

scripts/start_fabric.sh

@@ -23,7 +23,7 @@ SCRIPT_DIR="$(dirname $(readlink --canonicalize ${BASH_SOURCE}))"
 MINIFAB_URL=https://tinyurl.com/s8fmmvx
 MINIFAB_INSTALL_DIR=~/.local/bin/
 # Command line options
-WORK_DIR=~/mywork
+WORK_DIR=$TCF_HOME/mywork
 START_FABRIC=0
 STOP_FABRIC=0
 CLEAN_UP_WORK_DIR=0
@@ -112,10 +112,10 @@ while getopts "w:udche" OPTCHAR ; do
             echo "   -? or -h print usage information" 1>&2
             echo "Examples:" 1>&2
             echo "   $BN -u" 1>&2
-            echo "   $BN -w ~/mywork -u" 1>&2
-            echo "   $BN -w ~/mywork -d" 1>&2
-            echo "   $BN -w ~/mywork -c" 1>&2
-            echo "   $BN -w ~/mywork -u -e" 1>&2
+            echo "   $BN -w $TCF_HOME/mywork -u" 1>&2
+            echo "   $BN -w $TCF_HOME/mywork -d" 1>&2
+            echo "   $BN -w $TCF_HOME/mywork -c" 1>&2
+            echo "   $BN -w $TCF_HOME/mywork -u -e" 1>&2
             exit 2
             ;;
     esac