diff --git a/.travis.yml b/.travis.yml index f7d5bcaa..067f04d5 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 41f7f648..99c46450 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 e8bbaa94..70acd912 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)