Merge remote-tracking branch 'origin/master' into stable

9seconds · Mar 3, 2021 · 28fe63d · 28fe63d
2 parents 4aab3b6 + 7718f62
commit 28fe63d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -125,7 +125,7 @@ jobs:
         with:
           pull: true
           context: .
-          platforms: linux/amd64,linux/arm64,linux/386
+          platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7,linux/arm/v6
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 ###############################################################################
 # BUILD STAGE
 
-FROM golang:1.15-alpine AS build
+FROM golang:1.16-alpine AS build
 
 RUN set -x \
   && apk --no-cache --update add \