Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
  • Loading branch information
mbrandenburger committed Jul 23, 2024
1 parent 722f1a5 commit ebc1277
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 3 additions & 3 deletions samples/deployment/test-network/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ ecc-container:
if [ "${WITH_GO}" = "YES" ]; then \
export ECC_PATH=${CC_PATH}/mrenclave ; \
else \
export ECC_PATH=${CC_PATH}/_build/lib ; \
export ECC_PATH=${CC_PATH}/_build/lib ; \
fi && \
make -C ${CC_PATH} && \
make -C ${FPC_PATH}/ecc DOCKER_IMAGE=fpc/fpc-${CC_ID}$${HW_EXTENSION} DOCKER_ENCLAVE_SO_PATH=$${ECC_PATH} all docker
make -C ${FPC_PATH}/ecc DOCKER_IMAGE=fpc/fpc-${CC_ID}$${HW_EXTENSION} DOCKER_ENCLAVE_SO_PATH=${ECC_PATH} all docker

ercc-ecc-start:
if [ ! -z "${DOCKERD_FPC_PATH}" ]; then \
Expand All @@ -46,4 +46,4 @@ ercc-ecc-stop:
env CC_ID=${CC_ID} FPC_VERSION=${FPC_VERSION} ${DOCKER_COMPOSE} down

clobber:
rm -rf blockchain-explorer fabric-samples .env
rm -rf blockchain-explorer fabric-samples .env
3 changes: 3 additions & 0 deletions samples/deployment/test-network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ This guide works also with the FPC Dev docker container.

## Prepare FPC Containers

[//]: # (TODO lets work this section)

FPC requires a special docker container to execute a FPC chaincode, similar to Fabric's `ccenv` container image but with additional support for Intel SGX.
You can pull the FPC chaincode environment image (`fabric-private-chaincode-ccenv`) from our Github repository or build them manually as follows:

Expand All @@ -25,6 +27,7 @@ Use `CC_ID` and `CC_PATH` to define the FPC Chaincode you want to build.
cd $FPC_PATH/samples/deployment/test-network
export CC_ID=echo
export CC_PATH=$FPC_PATH/samples/chaincode/echo
# TODO this needs to be changed!
export CC_VER=$(cat CC_PATH/)
make build
```
Expand Down

0 comments on commit ebc1277

Please sign in to comment.