Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 14f03ec

Browse files
committed
Update to Go 1.16
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 88f84af commit 14f03ec

File tree

7 files changed

+9
-4
lines changed

7 files changed

+9
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ aliases:
1717
- image: dockereng/kube-compose-ci-golang
1818
auth: *docker-login
1919
public-golang: &public-golang
20-
- image: circleci/golang:1.13.0
20+
- image: circleci/golang:1.16
2121
user: root
2222

2323
e2e-kind-steps: &e2e-kind-steps

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ WORKDIR /home/compose
1212

1313

1414
FROM ${BUILD_BASE} AS build
15+
ENV GO111MODULE=off
1516

1617
RUN apk add --no-cache \
1718
coreutils \

Dockerfile.buildkit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ USER compose
1212
WORKDIR /home/compose
1313

1414
FROM ${BUILD_BASE} AS build
15+
ENV GO111MODULE=off
1516

1617
RUN apk add --no-cache \
1718
coreutils \

Dockerfile.debuggable

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ ARG BUILD_BASE
33
ARG RUN_BASE
44

55
FROM ${BUILD_BASE} AS build
6+
ENV GO111MODULE=off
67
RUN apk add --no-cache \
78
coreutils \
89
make \

docker.Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
include common.mk
22

3-
export BUILD_BASE_IMAGE = golang:1.13.0-alpine3.10
4-
export TEST_BASE_IMAGE = golang:1.13.0
5-
export RUN_BASE_IMAGE = alpine:3.10.2
3+
export BUILD_BASE_IMAGE = golang:1.16.13-alpine3.14
4+
export TEST_BASE_IMAGE = golang:1.16.13
5+
export RUN_BASE_IMAGE = alpine:3.14
66
export KUBERNETES_VERSION ?= 1.16.1
77
KIND_VERSION ?= 0.5.1
88
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

dockerfiles/Dockerfile.dev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG BUILD_BASE
22

33
FROM ${BUILD_BASE} as dev
4+
ENV GO111MODULE=off
45

56
RUN apk add --no-cache \
67
bash \

dockerfiles/Dockerfile.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG TEST_BASE
22
FROM ${TEST_BASE}
3+
ENV GO111MODULE=off
34
WORKDIR /go/src/github.com/docker/compose-on-kubernetes
45
RUN apt update && apt install -y build-essential && rm -rf /var/lib/apt/lists/*
56
RUN go get -u github.com/wadey/gocovmerge

0 commit comments

Comments
 (0)