From feab405f183ea88c9a3f0d28de3dd4812e0c16e5 Mon Sep 17 00:00:00 2001
From: Michael Gibson <michael@shumei.thegibsonhome.lan>
Date: Thu, 3 Dec 2020 15:08:52 -0600
Subject: [PATCH] Updated golang version, removed armv6.

---
 .drone.yml | 4 ++--
 Dockerfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8b03597..08ca7be 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,8 +32,8 @@ steps:
       - 'docker buildx version'
       - 'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes'
       - 'docker buildx create --name multiarch --use'
-      #- 'docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --output=type=image,push=true --progress tty --build-arg TAG=$DRONE_TAG -t $REGISTRY_HOST/$IMAGE:$DRONE_TAG -t $REGISTRY_HOST/$IMAGE:latest .'
-      - 'docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --output=type=image,push=true --progress tty --build-arg TAG="br-1.5.2" -t $REGISTRY_HOST/$IMAGE:latest .'
+      #- 'docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --output=type=image,push=true --progress tty --build-arg TAG=$DRONE_TAG -t $REGISTRY_HOST/$IMAGE:$DRONE_TAG -t $REGISTRY_HOST/$IMAGE:latest .'
+      - 'docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --output=type=image,push=true --progress tty --build-arg TAG="br-1.5.2" -t $REGISTRY_HOST/$IMAGE:latest .'
     volumes:
       - name: docker_socket
         path: /var/run
diff --git a/Dockerfile b/Dockerfile
index 307a4f5..90244d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the ProtonMail Bridge.
-FROM golang:1.14-alpine as build
+FROM golang:1.15-alpine as build
 ENV LANG C.UTF-8
 RUN apk add --no-cache \
       curl \