Update to Go 1.16

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker · Jan 28, 2022 · a93d3c0 · a93d3c0
1 parent 46a31e2
commit a93d3c0
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,7 +17,7 @@ aliases:
     - image: dockereng/kube-compose-ci-golang
       auth: *docker-login
   public-golang: &public-golang
-    - image: circleci/golang:1.13.0
+    - image: circleci/golang:1.16
       user: root
 
   e2e-kind-steps: &e2e-kind-steps

diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,7 @@ WORKDIR /home/compose
 
 
 FROM ${BUILD_BASE} AS build
+ENV GO111MODULE=off
 
 RUN apk add --no-cache \
   coreutils \

diff --git a/Dockerfile.buildkit b/Dockerfile.buildkit
@@ -12,6 +12,7 @@ USER compose
 WORKDIR /home/compose
 
 FROM ${BUILD_BASE} AS build
+ENV GO111MODULE=off
 
 RUN apk add --no-cache \
   coreutils \

diff --git a/Dockerfile.debuggable b/Dockerfile.debuggable
@@ -3,6 +3,7 @@ ARG BUILD_BASE
 ARG RUN_BASE
 
 FROM ${BUILD_BASE} AS build
+ENV GO111MODULE=off
 RUN apk add --no-cache \
   coreutils \
   make \

diff --git a/docker.Makefile b/docker.Makefile
@@ -1,8 +1,8 @@
 include common.mk
 
-export BUILD_BASE_IMAGE = golang:1.13.0-alpine3.10
-export TEST_BASE_IMAGE = golang:1.13.0
-export RUN_BASE_IMAGE = alpine:3.10.2
+export BUILD_BASE_IMAGE = golang:1.16.13-alpine3.14
+export TEST_BASE_IMAGE = golang:1.16.13
+export RUN_BASE_IMAGE = alpine:3.14
 export KUBERNETES_VERSION ?= 1.16.1
 KIND_VERSION ?= 0.5.1
 IMAGES = ${IMAGE_REPO_PREFIX}controller ${IMAGE_REPO_PREFIX}controller-coverage ${IMAGE_REPO_PREFIX}e2e-tests ${IMAGE_REPO_PREFIX}e2e-benchmark ${IMAGE_REPO_PREFIX}api-server ${IMAGE_REPO_PREFIX}api-server-coverage ${IMAGE_REPO_PREFIX}installer

diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
@@ -1,6 +1,7 @@
 ARG     BUILD_BASE
 
 FROM    ${BUILD_BASE} as dev
+ENV     GO111MODULE=off
 
 RUN     apk add --no-cache \
         bash \