Merge pull request #735 from dodo920306/task/the-refactoring

The Refactor

Author: yeasy

.github/workflows/docker-image.yml

@@ -12,22 +12,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Build images
-        run: |
-          make docker-compose
-      - name: Start services
-        run: |
-          MODE=dev make start
-          sleep 10
-      - name: Run newman tests
-        run: |
-          make check-api
-      - name: Stop services
-        if: always()
+
+      - name: Start Dashboard, DB, and API Engine
+        run: docker compose -f docker-compose.dev.yaml up -d --build
+
+      - name: Start Hyperledger Fabric Agent
+        working-directory: src/agents/hyperledger-fabric
         run: |
-          MODE=dev make stop
+          docker build -t cello-hyperledger-fabric-agent .
+          docker run -d --network cello-net -v /var/run/docker.sock:/var/run/docker.sock --name cello-hyperledger-fabric-agent cello-hyperledger-fabric-agent
+
+      - name: Build Hyperledger Fabric Node
+        working-directory: src/nodes/hyperledger-fabric
+        run: docker build -t hyperledger/fabric:2.5.14 .
+
+      - name: Stop Hyperledger Fabric Agent
+        run: docker stop cello-hyperledger-fabric-agent
+
+      - name: Stop Dashboard, DB, and API Engine
+        run: docker compose -f docker-compose.dev.yaml down -v
+
       - name: Clean up
         if: always()
-        run: |
-          make clean
-          docker system prune -f
+        run: docker system prune -a -f

.gitignore

@@ -137,7 +137,6 @@ fabric.properties
 bin/
 tmp/
 *.tmp
-*.bak
 *.swp
 *~.nib
 local.properties
@@ -219,7 +218,6 @@ yarn-error.log
 /coverage
 .idea
 package-lock.json
-*bak
 .vscode
 
 # visual studio code
@@ -244,9 +242,9 @@ src/dashboard/lambda/mock/index.js
 .config
 .config.old
 
-# Cello local storage
-/**/opt/*
-/**/cello/*
+# Fabric
+src/api-engine/cello/builders
+src/api-engine/cello/config
 
 # Local Netlify folder
 .netlify
@@ -257,4 +255,11 @@ tests/postman/env.json
 tests/postman/junitResult.xml
 
 # Postgres
-pgdata/
+pgdata/
+
+src/api-engine/cello/*
+!src/api-engine/cello/node
+!src/api-engine/cello/application-gateway
+src/api-engine/api/v1/media
+src/agents/hyperledger-fabric/cello/*
+!src/agents/hyperledger-fabric/cello/.gitkeep

Makefile

@@ -208,7 +208,7 @@ check-api: ##@Test Run API tests with newman
 	cd tests/postman && docker compose up --abort-on-container-exit || (echo "API tests failed $$?"; exit 1)
 
 start-docker-compose:
-	docker compose -f bootup/docker-compose-files/${COMPOSE_FILE} up -d --force-recreate --remove-orphans
+	docker compose -f docker-compose.dev.yaml up -d --build --force-recreate --remove-orphans
 
 stop-docker-compose:
 	echo "Stop all services with bootup/docker-compose-files/${COMPOSE_FILE}..."
@@ -224,7 +224,7 @@ docker-rest-agent:
 	docker build -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP) --platform linux/$(ARCH)
 
 fabric:
-	docker build -t hyperledger/fabric:2.5.13 -f build_image/docker/cello-hlf/Dockerfile build_image/docker/cello-hlf/
+	docker build -t hyperledger/fabric:2.5.14 src/nodes/hyperledger-fabric
 
 dashboard:
 	docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./