Publish multi-arch functions

Signed-off-by: Alistair Hey <alistair@heyal.co.uk>

Author: Waterdrips

.github/workflows/build.yml

@@ -26,23 +26,23 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - name: Run Tests
         run: curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash && make test-chart
-  # Run the CI tests
   build-stack:
     strategy:
       matrix:
-        go-version: [1.13.x]
         os: [ubuntu-latest]
+        stack-file: [
+        stack.yml,
+        dashboard/stack.yml,
+        aws.yml,
+        gitlab.yml
+        ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
-      - name: Install Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-      - name: Run CI
-        run: sh ./contrib/ci.sh
+      - name: Run Build
+        run: STACKFILE=${{ matrix.stack-file }} sh ./contrib/ci.sh
 
   # Test building the non-cli Containers
   build-containers:
@@ -77,6 +77,6 @@ jobs:
           outputs: "type=image,push=false"
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ github.sha }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:latest
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/ofc-${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/ofc-${{ matrix.svc }}:${{ github.sha }}
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/ofc-${{ matrix.svc }}:latest

.github/workflows/publish.yaml

@@ -7,21 +7,25 @@ on:
 
 
 jobs:
-  # Run the CI tests
   publish-stack:
     strategy:
       matrix:
-        go-version: [1.13.x]
         os: [ubuntu-latest]
+        stack-file: [
+          stack.yml,
+          dashboard/stack.yml,
+          aws.yml,
+          gitlab.yml
+        ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
-      - name: Install Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Login to Docker Registry
         uses: docker/login-action@v1
         with:
@@ -35,9 +39,8 @@ jobs:
         id: get_repo_owner
         run: echo ::set-output name=repo_owner::$(echo ${{ github.event.repository.owner.login }} | tr '[:upper:]' '[:lower:]')
       - name: Deploy Stacks
-        run: TAG=${{ steps.get_tag.outputs.TAG }} REPO=${{ steps.get_repo_owner.outputs.repo_owner }} sh ./contrib/publish.sh
+        run: STACKFILE=${{ matrix.stack-file }} TAG=${{ steps.get_tag.outputs.TAG }} REPO=${{ steps.get_repo_owner.outputs.repo_owner }} sh ./contrib/publish.sh
 
-  # Test building the non-cli Containers
   publish-containers:
     runs-on: ubuntu-latest
     strategy:
@@ -76,6 +79,6 @@ jobs:
           outputs: "type=registry,push=true"
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:${{ github.sha }}
-            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/${{ matrix.svc }}:latest
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/ofc-${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/ofc-${{ matrix.svc }}:${{ github.sha }}
+            ghcr.io/${{ steps.get_repo_owner.outputs.repo_owner }}/ofc-${{ matrix.svc }}:latest

contrib/ci.sh

@@ -6,7 +6,7 @@ CLI="faas-cli"
 if ! [ -x "$(command -v faas-cli)" ]; then
     HERE=`pwd`
     cd /tmp/
-    curl -sL https://github.com/openfaas/faas-cli/releases/download/0.9.3/faas-cli > faas-cli
+    curl -sL https://github.com/openfaas/faas-cli/releases/download/0.12.19/faas-cli > faas-cli
     chmod +x ./faas-cli
     CLI="/tmp/faas-cli"
 
@@ -16,7 +16,4 @@ fi
 
 echo "Working folder: `pwd`"
 
-$CLI build --parallel=4
-$CLI build -f dashboard/stack.yml
-$CLI build -f aws.yml
-$CLI build -f gitlab.yml
+$CLI build -f $STACKFILE

contrib/publish.sh

@@ -7,7 +7,7 @@ CLI="faas-cli"
 if ! [ -x "$(command -v faas-cli)" ]; then
     HERE=`pwd`
     cd /tmp/
-    curl -sL https://github.com/openfaas/faas-cli/releases/download/0.9.3/faas-cli > faas-cli
+    curl -sL https://github.com/openfaas/faas-cli/releases/download/0.12.19/faas-cli > faas-cli
     chmod +x ./faas-cli
     CLI="/tmp/faas-cli"
 
@@ -17,10 +17,4 @@ fi
 
 echo "Working folder: `pwd`"
 
-$CLI up --parallel=4 --skip-deploy
-HERE=`pwd`
-cd dashboard
-$CLI up -f stack.yml --skip-deploy
-cd $HERE
-$CLI up -f gitlab.yml --skip-deploy
-$CLI up -f aws.yml --skip-deploy
+$CLI publish -f $STACKFILE --platforms linux/amd64,linux/arm64,linux/arm/v7

dashboard/stack.yml

@@ -2,16 +2,17 @@ provider:
   name: openfaas
   gateway: http://127.0.0.1:8080
 
+# needs to be run from root folder
 functions:
   system-dashboard:
     lang: node12
-    handler: ./of-cloud-dashboard
+    handler: ./dashboard/of-cloud-dashboard
     image: ghcr.io/${REPO:-openfaas}/of-cloud-dashboard:${TAG:-dev}
     labels:
       openfaas-cloud: "1"
       role: openfaas-system
     environment_file:
-      - dashboard_config.yml
+      - dashboard/dashboard_config.yml
     limits:
       memory: 256Mi
     requests: