golang: default to 1.16 on alpine 3.12 (#32)

Side-step a number of issues specific to the way we build with docker in drone. Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
rancher · Mar 23, 2021 · 6dd289a · 6dd289a
1 parent b23c05d
commit 6dd289a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG=golang:1.16-alpine
+ARG GOLANG=golang:1.16-alpine3.12
 FROM ${GOLANG} AS base
 RUN set -x \
  && apk --no-cache add \

diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ GO_LDFLAGS += -X $(PKG)/pkg/version.Version=$(TAG)
 GO_LDFLAGS += -X $(PKG)/pkg/server.DefaultAgentImage=docker.io/$(ORG)/kim
 
 GO ?= go
-GOLANG ?= docker.io/library/golang:1.15-alpine
+GOLANG ?= golang:1.16-alpine3.12
 
 BIN ?= bin/kim
 ifeq ($(GOOS),windows)