Merge pull request #41 from sownak/main

Added external chaincode for Supplychain Fabric
hyperledger-bevel · Aug 25, 2023 · 94327a0 · 94327a0
2 parents f6bd046 + 49d3f82
commit 94327a0
Show file tree

Hide file tree

Showing 59 changed files with 2,776 additions and 433 deletions.
diff --git a/.github/workflows/dci_lint.yml b/.github/workflows/dci_lint.yml
@@ -3,10 +3,10 @@ name: DCI Lint
 # Triggers the workflow on push or pull request events
 on:
   push:
-    branches: [main, develop]
+    branches: [main]
 
   pull_request:
-    branches: [main, develop]
+    branches: [main]
 
 jobs:
   DCI-Lint:

diff --git a/.github/workflows/img_helper_corda.yml b/.github/workflows/img_helper_corda.yml
@@ -5,47 +5,32 @@
 ##############################################################################################
 
 # Build corda os docker images triggered by :
-#  - push on develop branch for latest tags
-#  - create tag vx.y.z for release tags
+#  - push on main branch for latest tags
 #  - Can be triggered manually
 
-name: Build Corda Opensource docker images
+name: Build Corda Opensource helper images
 
 on:
   workflow_dispatch:
     inputs:
-      corda_version:
-        description: 'Enter Corda OS Version to build'
-        required: true
-        default: '4.9'
-        type: choice
-        options:
-        - '4.4'
-        - '4.7'
-        - '4.9'
       gmaps_key:
         description: 'Enter Google Maps API key'
         required: false
         default: 'Google API key for Network Map'
-  create:
-    tags:
-      - v*
   push:
     branches:
-      - develop
+      - main
     paths:
-      - 'platforms/r3-corda/images/**'
-      - '.github/workflows/img_platform_corda.yml'
-      - 'examples/supplychain-app/corda/cordApps_springBoot/**'
+      - 'images/**'
+      - '.github/workflows/img_helper_corda.yml'
 
 env:
   REGISTRY: ghcr.io
   IMAGE_PATH: ghcr.io/${{ github.repository_owner }}
 
 jobs:
-  # on push to develop branch, create docker tags latest
+  # on push to main branch, create docker tags latest
   cordaOS-latest:
-    if: ${{ startsWith(github.ref, 'refs/heads/develop') }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -86,7 +71,7 @@ jobs:
         update-alternatives --list java
 
         echo "---- building networkmap ----"
-        cd ${WDIR}/platforms/r3-corda/images/networkmap
+        cd ${WDIR}/images/networkmap
 
         # Replace the Google Maps API key in two files
         sed -i -e 's*REPLACE_ME_GMAPS_KEY*${{ github.event.inputs.gmaps_key }}*g' website/app/scripts/geoCode.js
@@ -95,90 +80,21 @@ jobs:
         mvn clean install -DskipTests
 
         echo "---- building doorman ----"
-        cd ${WDIR}/platforms/r3-corda/images/doorman
+        cd ${WDIR}/images/doorman
         mvn clean install -DskipTests
 
     - name: Build and push cordaOS doorman latest
       id: corda_doorman_latest
       uses: docker/build-push-action@v2
       with:
-        context: platforms/r3-corda/images/doorman
+        context: images/doorman
         push: true
         tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-doorman-linuxkit:latest
 
     - name: Build and push cordaOS networkmap latest
       id: corda_networkmap_latest
       uses: docker/build-push-action@v2
       with:
-        context: platforms/r3-corda/images/networkmap
+        context: images/networkmap
         push: true
         tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-networkmap-linuxkit:latest
-
-  cordaOS-release:
-    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: '8'
-
-    - name: Set output
-      id: vars
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/v}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Login to the container registry
-      uses: docker/login-action@v1
-      with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Lowercase IMAGE_PATH
-      id: image_path_format
-      uses: ASzc/change-string-case-action@v2
-      with:
-        string: ${{ env.IMAGE_PATH }}
-
-    - name: corda builds
-      run: |
-        WDIR=`pwd`
-
-        java -version
-        update-alternatives --list java
-
-        echo "---- building networkmap ----"
-        cd ${WDIR}/platforms/r3-corda/images/networkmap
-        mvn clean install -DskipTests
-
-        echo "---- building doorman ----"
-        cd ${WDIR}/platforms/r3-corda/images/doorman
-        mvn clean install -DskipTests
-
-    - name: Build and push cordaOS doorman release tag ${{ steps.vars.outputs.tag }}
-      id: corda_doorman_release
-      uses: docker/build-push-action@v2
-      with:
-        context: platforms/r3-corda/images/doorman
-        push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-doorman-linuxkit:${{ steps.vars.outputs.tag }},${{ steps.image_path_format.outputs.lowercase }}/bevel-doorman-linuxkit:stable
-
-    - name: Build and push cordaOS networkmap release tag ${{ steps.vars.outputs.tag }}
-      id: corda_networkmap_release
-      uses: docker/build-push-action@v2
-      with:
-        context: platforms/r3-corda/images/networkmap
-        push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-networkmap-linuxkit:${{ steps.vars.outputs.tag }},${{ steps.image_path_format.outputs.lowercase }}/bevel-networkmap-linuxkit:stable
diff --git a/.github/workflows/img_supplychain_besu.yml b/.github/workflows/img_supplychain_besu.yml
@@ -5,32 +5,28 @@
 ##############################################################################################
 
 # Build express app docker image triggered by :
-#  - push on develop branch for latest tags
+#  - push on main branch for latest tags
 #  - create tag vx.y.z for release tags
 #  - Can be triggered manually
 
 name: Build Supplychain App Besu Images
 
 on:
   workflow_dispatch:
-  create:
-    tags:
-      - v*
   push:
     branches:
-      - develop
+      - main
     paths:
       - '.github/workflows/img_supplychain_besu.yml'
-      - 'examples/supplychain-app/besu/express_nodeJS/Dockerfile'
+      - 'examples/supplychain-app/besu/express_nodeJS/**'
 
 env:
   REGISTRY: ghcr.io
   IMAGE_PATH: ghcr.io/${{ github.repository_owner }}
 
 jobs:
-  # on push to develop branch, create docker tags latest
+  # on push to main branch, create docker tags latest
   besu-latest:
-    if: ${{ startsWith(github.ref, 'refs/heads/develop') }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -65,45 +61,4 @@ jobs:
       with:
         context: ./examples/supplychain-app/besu/express_nodeJS
         push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-supplychain-besu:express-app-latest
-
-  besu-release: 
-    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Set output
-      id: vars
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/v}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Login to the container registry
-      uses: docker/login-action@v1
-      with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Lowercase IMAGE_PATH
-      id: image_path_format
-      uses: ASzc/change-string-case-action@v2
-      with:
-        string: ${{ env.IMAGE_PATH }}
-
-    - name: Build and push supplychain app release
-      id: besu_supplychain_release
-      uses: docker/build-push-action@v2
-      with:
-        context: examples/supplychain-app/besu/express_nodeJS
-        push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-besu:express-app-${{ steps.vars.outputs.tag }},${{ steps.image_path_format.outputs.lowercase }}/bevel-supplychain-quorum:express-app-stable
+        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-supplychain-besu:express-app-latest
diff --git a/.github/workflows/img_supplychain_corda.yml b/.github/workflows/img_supplychain_corda.yml
@@ -5,32 +5,29 @@
 ##############################################################################################
 
 # Build Supplychain-App Corda docker images triggered by :
-#  - push on develop branch for latest tags 
+#  - push on main branch for latest tags 
 #  - create tag vx.y.z for release tags
 #  - Can be triggered manually
 
 name: Build Supplychain App Corda Images
 
 on:
   workflow_dispatch:
-  create:
-    tags:
-      - v*
   push:
     branches:
-      - develop
+      - main
     paths:
-      - 'examples/supplychain-app/corda/**'
+      - 'examples/supplychain-app/corda/express_nodeJS/**'
+      - 'examples/supplychain-app/corda/cordApps_springBoot/**'
       - '.github/workflows/img_supplychain_corda.yml'
 
 env:
   REGISTRY: ghcr.io
   IMAGE_PATH: ghcr.io/${{ github.repository_owner }}
 
 jobs:
-  # on push to develop branch, create docker tags latest
+  # on push to main branch, create docker tags latest
   corda-latest:
-    if: ${{ startsWith(github.ref, 'refs/heads/develop') }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -79,78 +76,12 @@ jobs:
       with:
         context: examples/supplychain-app/corda/express_nodeJS
         push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-supplychain-corda:express-app-latest
+        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-supplychain-corda:express-app-latest
 
     - name: Build and push supplychain springboot
       id: corda_springboot_latest
       uses: docker/build-push-action@v2
       with:
         context: examples/supplychain-app/corda/cordApps_springBoot
         push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-supplychain-corda:springboot-latest
-
-  corda-release: 
-    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: '8'
-
-    - name: Build the Webservers
-      run: |
-        WDIR=`pwd`
-        
-        java -version
-             
-        cd ${WDIR}/examples/supplychain-app/corda/cordApps_springBoot
-
-        ./gradlew deployWebapps
-
-        ls build/webapps
-
-    - name: Set output
-      id: vars
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/tags/v}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Login to the container registry
-      uses: docker/login-action@v1
-      with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Lowercase IMAGE_PATH
-      id: image_path_format
-      uses: ASzc/change-string-case-action@v2
-      with:
-        string: ${{ env.IMAGE_PATH }}
-
-    - name: Build and push supplychain app release
-      id: corda_express_release
-      uses: docker/build-push-action@v2
-      with:
-        context: examples/supplychain-app/corda/express_nodeJS
-        push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-supplychain-corda:express-app-${{ steps.vars.outputs.tag }},${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-supplychain-corda:express-app-stable
-
-    - name: Build and push supplychain springboot
-      id: corda_springboot_release
-      uses: docker/build-push-action@v2
-      with:
-        context: examples/supplychain-app/corda/cordApps_springBoot
-        push: true
-        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-supplychain-corda:springboot-${{ steps.vars.outputs.tag }},${{ steps.image_path_format.outputs.lowercase }}/bevel-samples-supplychain-corda:springboot-stable
+        tags: ${{ steps.image_path_format.outputs.lowercase }}/bevel-supplychain-corda:springboot-latest