Make edge-router build multi-arch

This commit converts the edge-route dockerfile to multi-arch builds.
This was tested on a ofc cluster. After swapping in the new container
the service worked as normal

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

.github/workflows/build.yml

@@ -9,7 +9,8 @@ on:
       - '*'
 
 jobs:
-  build:
+  # Run the CI tests
+  test:
     strategy:
       matrix:
         go-version: [1.13.x]
@@ -25,3 +26,55 @@ jobs:
           go-version: ${{ matrix.go-version }}
       - name: Run CI
         run: sh ./contrib/ci.sh
+
+  # Test building the non-cli Containers
+  build-containers:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [1.13.x]
+        svc: [
+          edge-auth,
+          edge-router,
+          of-builder
+        ]
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Get TAG
+        id: get_tag
+        run: echo ::set-output name=TAG::latest-dev
+      - name: Build ${{ matrix.svc }}
+        uses: docker/build-push-action@v2
+        with:
+          context: ./${{ matrix.svc }}
+          file: ./${{ matrix.svc }}/Dockerfile
+          outputs: "type=image,push=false"
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          tags: |
+            ghcr.io/openfaas/${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
+            ghcr.io/openfaas/${{ matrix.svc }}:${{ github.sha }}
+              ghcr.io/openfaas/${{ matrix.svc }}:latest
+  # TODO add build for all containers in here
+  build-stack:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [1.13.x]
+        svc: [
+          edge-auth,
+          edge-router,
+          of-builder
+        ]
+    steps:
+      - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+      - name: Get TAG
+        id: get_tag
+        run: echo ::set-output name=TAG::latest-dev

.github/workflows/publish.yaml

@@ -18,10 +18,12 @@ jobs:
         ]
     steps:
       - uses: actions/checkout@master
+        with:
+          fetch-depth: 1
       - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
+        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
@@ -38,13 +40,17 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           registry: ghcr.io
       - name: Build and push ${{ matrix.svc }}
-      uses: docker/build-push-action@v2
-      with:
-        context: ./${{ matrix.svc }}
-        file: ./${{ matrix.svc }}/Dockerfile
-        outputs: "type=registry,push=true"
-        platforms: linux/amd64,linux/arm/v7,linux/arm64
-        tags: |
-        ghcr.io/openfaas/${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
-        ghcr.io/openfaas/${{ matrix.svc }}:${{ github.sha }}
-        ghcr.io/openfaas/${{ matrix.svc }}:latest
+        uses: docker/build-push-action@v2
+        with:
+          context: ./${{ matrix.svc }}
+          file: ./${{ matrix.svc }}/Dockerfile
+          outputs: "type=registry,push=true"
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          tags: |
+            ghcr.io/openfaas/${{ matrix.svc }}:${{ steps.get_tag.outputs.TAG }}
+            ghcr.io/openfaas/${{ matrix.svc }}:${{ github.sha }}
+            ghcr.io/openfaas/${{ matrix.svc }}:latest
+# Need a section for faas-cli on each fn in stack.yaml
+# section for of-dashboard's stack.yaml
+# https://github.com/alexellis/multiarch-templates/
+# Section to run the chart tests

dashboard/stack.yml

@@ -2,6 +2,7 @@ provider:
   name: openfaas
   gateway: http://127.0.0.1:8080
 
+# TODO Waterdrips this multi-arch
 functions:
   system-dashboard:
     lang: node12

edge-auth/.gitignore

@@ -1,2 +1 @@
-auth
-edge-auth
+/edge-auth

edge-auth/Dockerfile

@@ -17,12 +17,14 @@ COPY template   template
 COPY provider   provider
 COPY main.go    .
 
-RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test -v ./...
+RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*")
+
+RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test -v
 
 RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=${CGO_ENABLED} go build \
         --ldflags "-s -w" \
-        -a -installsuffix cgo -o edge-auth .
-
+        -a -installsuffix cgo \
+        -o edge-auth .
 
 FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.12 as ship
 

edge-auth/Gopkg.toml

@@ -2,14 +2,6 @@
   name = "github.com/dgrijalva/jwt-go"
   version = "3.2.0"
 
-[[constraint]]
-  name = "github.com/alexellis/hmac"
-  version = "1.2"
-
-[[constraint]]
-  name = "github.com/openfaas/faas-provider"
-  version = "v0.15.0"
-
 [[constraint]]
   name = "github.com/openfaas/openfaas-cloud"
   version = "0.13.0"

edge-router/Dockerfile

@@ -1,4 +1,9 @@
-FROM golang:1.13-alpine AS build
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.13 as build
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
 
 WORKDIR /go/src/github.com/openfaas/openfaas-cloud/edge-router
 
@@ -12,17 +17,23 @@ COPY config_test.go     .
 COPY health.go          .
 COPY auth_proxy.go      .
 
-RUN go test -v \
-    && go build -o /usr/bin/edge-router .
+RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*")
+RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go test -v
+
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=${CGO_ENABLED} go build \
+        --ldflags "-s -w" \
+        -a -installsuffix cgo \
+        -o edge-router .
+
 
-FROM alpine:3.12 as ship
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.12 as ship
 
 RUN apk --no-cache add ca-certificates \
     && addgroup -S app && adduser -S -g app app \
     && mkdir -p /home/app \
     && chown app /home/app
 
-COPY --from=build /usr/bin/edge-router /bin/
+COPY --from=build /go/src/github.com/openfaas/openfaas-cloud/edge-router /bin/
 
 WORKDIR /home/app/
 USER app

of-builder/Dockerfile

@@ -1,5 +1,7 @@
 FROM golang:1.13-alpine AS builder
 
+## AH TODO set this up as a multi-arch build
+
 ENV CGO_ENABLED=0
 ENV GO111MODULE=off
 

stack.yml

@@ -55,7 +55,7 @@ functions:
     requests:
       memory: 32Mi
       cpu: 50m
-
+# TODO waterdrips, this dockerfile multiarch?
   git-tar:
     lang: dockerfile
     handler: ./git-tar