From def8f5473a08d101dd2decade39010a1d41160f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
Date: Wed, 18 Nov 2020 14:33:56 +0100
Subject: [PATCH] Update to golang 1.15 and alpine-3.12

---
 .travis.yml | 2 +-
 Dockerfile  | 2 +-
 Makefile    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f7d5bcaab9..067f04d52d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ services:
 
 language: go
 go:
-  - 1.13.x
+  - 1.15.x
 
 branches:
   only:
diff --git a/Dockerfile b/Dockerfile
index 41f7f64824..99c46450c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN apk add --no-cache \
       iptables \
diff --git a/Makefile b/Makefile
index e8bbaa94cd..70acd9128a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker)
 MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/
 BUILD_IN_DOCKER?=true
-DOCKER_BUILD_IMAGE?=golang:1.13.13-alpine3.12
+DOCKER_BUILD_IMAGE?=golang:1.15.5-alpine3.12
 DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.27.0
 QEMU_IMAGE?=multiarch/qemu-user-static
 ifeq ($(GOARCH), arm)