Merge pull request #3 from datachainlab/fix-demo

Fix demo and update README.md

Author: YukiTsuchida

.github/workflows/demo.yml

@@ -9,15 +9,15 @@ on:
 jobs:
   demo:
     name: demo
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Go 1.16
         uses: actions/setup-go@v1
         with:
           go-version: 1.16
       - uses: actions/checkout@v2
       - name: Cache go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -85,15 +85,15 @@ jobs:
           working-directory: demo/chains/tendermint
   unit-test:
     name: unit-test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
           go-version: 1.16
       - uses: actions/checkout@v2
       - name: Cache go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build

README.md

@@ -6,7 +6,7 @@ As Atomic commit protocol, [Simple commit protocol](https://datachainlab.github.
 
 ## Requirements
 
-- [Go](https://go.dev/) 1.16+
+- [Go](https://go.dev/) 1.16–1.18
 - [Docker](https://www.docker.com/products/docker-desktop)
 - [jq](https://stedolan.github.io/jq/)
 
@@ -68,6 +68,10 @@ make -C demo network
 
 ## Testing the demo
 
+This demo is primarily developed and validated on **Go 1.18**, and is supported on **Go 1.16–1.18**.  
+**Go 1.19 and later may exhibit unstable behavior** due to dependency and runtime differences.  
+To ensure a reproducible setup, we **strongly recommend Go 1.18**.
+
 ```Makefile
 # initialize relayer, fabric CLI, tendermint CLI, and run handshake for IBC between fabric and tendermint by creating transactions.
 make -C demo run-init

demo/Makefile

@@ -3,10 +3,10 @@
 # `-j` option (short for –jobs) specifies the number of jobs that are run at the same time
 .PHONY: build
 build:
-	make -C ../relayer build && mkdir -p ./bin && cp ../relayer/build/uly ./bin/ & \
-	make -C chains/fabric bin & \
-	cd chains/tendermint && go mod vendor && make docker-images & \
-	make -C ../cmds/alpha build & \
+	make -C ../relayer build && mkdir -p ./bin && cp ../relayer/build/uly ./bin/
+	make -C chains/fabric bin
+	cd chains/tendermint && go mod vendor && make docker-images
+	make -C ../cmds/alpha build
 	make -C ../cmds/beta build
 
 .PHONY: network

demo/chains/fabric/Makefile

@@ -18,18 +18,18 @@ network:
 
 .PHONY: network-common
 network-common:
-	IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
+	FABRIC_PLATFORM=${FABRIC_PLATFORM} IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
 	fabric-orderer.fabric-tendermint-cross-demo.com \
 	fabric-peer0.org1.fabric-tendermint-cross-demo.com
 
 .PHONY: network-chaincode
 network-chaincode:
-	IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
+	FABRIC_PLATFORM=${FABRIC_PLATFORM} IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} up -d \
 	fabric-chaincode.org1.fabric-tendermint-cross-demo.com
 
 .PHONY: network-down
 network-down:
-	IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} down -v --remove-orphans
+	FABRIC_PLATFORM=${FABRIC_PLATFORM} IMAGE_TAG=${FABRIC_VERSION} ${DOCKER_COMPOSE} down -v --remove-orphans
 
 .PHONY: clean
 clean:

demo/chains/fabric/docker-compose.yaml

@@ -7,6 +7,7 @@ services:
   fabric-orderer.fabric-tendermint-cross-demo.com:
     container_name: fabric-orderer.fabric-tendermint-cross-demo.com
     image: hyperledger/fabric-orderer:${IMAGE_TAG}
+    platform: ${FABRIC_PLATFORM}
     environment:
       - FABRIC_LOGGING_SPEC=INFO
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@@ -31,6 +32,7 @@ services:
   fabric-peer0.org1.fabric-tendermint-cross-demo.com:
     container_name: fabric-peer0.org1.fabric-tendermint-cross-demo.com
     image: hyperledger/fabric-peer:${IMAGE_TAG}
+    platform: ${FABRIC_PLATFORM}
     environment:
       - FABRIC_LOGGING_SPEC=INFO
       - CORE_PEER_ID=fabric-peer0.org1.fabric-tendermint-cross-demo.com

demo/chains/fabric/scripts/startCC.sh

@@ -8,4 +8,4 @@ CHAINCODE_CCID_ORG1=$(cat ${PROJECT_DIR}/build/Org1-fabibc-ccid.txt)
 
 set -x
 CHAINCODE_CCID_ORG1=${CHAINCODE_CCID_ORG1} \
-docker-compose -f docker-compose-chaincode.yaml up -d \
+docker compose -f docker-compose-chaincode.yaml up -d \

demo/var.mk

@@ -1,12 +1,13 @@
 DOCKER         ?= docker
-DOCKER_COMPOSE ?= docker-compose
+DOCKER_COMPOSE ?= docker compose
 DOCKER_REPO    ?= ""
 DOCKER_BUILD   ?= $(DOCKER) build --rm --no-cache --pull
 
 MAKEFILE_DIR:=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 FABRIC_VERSION    ?=2.2.0
 FABRIC_CA_VERSION ?=1.4.7
+FABRIC_PLATFORM   ?=linux/amd64
 
 TENDERMINT_TAG ?= latest