Merge pull request #130 from pSchlarb/NodeDockerfileMerge

Node dockerfile merge & Dispatchable Workflow
hyperledger · Mar 27, 2023 · 19da829 · 19da829
2 parents c047aac + 5471429
commit 19da829
Show file tree

Hide file tree

Showing 8 changed files with 457 additions and 205 deletions.
diff --git a/.github/workflows/callable_test-automation-extention.yaml b/.github/workflows/callable_test-automation-extention.yaml
@@ -203,7 +203,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./system/docker/node
-          file: ./system/docker/node/Dockerfile.extention
+          file: ./system/docker/node/Dockerfile.node
           push: false
           tags: ${{ steps.prep.outputs.tags }}
           labels: |
@@ -212,6 +212,8 @@ jobs:
             org.opencontainers.image.revision=${{ github.sha }}
           build-args: |
             EXTENTION_DEB=${{ env.INPUT_DEBNAME }}
+            CALL_FROM_EXTENTION=yes
+            CALL_FROM_NODE=no
           outputs: type=docker,dest=/tmp/node_image_${{ env.INPUT_UBUNTUVERSION }}.tar
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

diff --git a/.github/workflows/callable_test-automation-node.yaml b/.github/workflows/callable_test-automation-node.yaml
@@ -206,6 +206,8 @@ jobs:
             org.opencontainers.image.revision=${{ github.sha }}
           build-args: |
             EXTENTION_DEB=${{ env.INPUT_DEBNAME }}
+            CALL_FROM_EXTENTION=no
+            CALL_FROM_NODE=yes
           outputs: type=docker,dest=/tmp/node_image_${{ env.INPUT_UBUNTUVERSION }}.tar
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max