From 19a5193754a7e5d7593488e82523116e730430d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan-Luis=20de=20Sousa-Valadas=20Casta=C3=B1o?= Date: Wed, 3 May 2023 15:43:18 +0200 Subject: [PATCH] Bump golang to 1.20.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since I was bumping the version I decided to move it to Makefile.variables because it's used in more than one place. Signed-off-by: Juan-Luis de Sousa-Valadas CastaƱo --- Dockerfile | 4 +++- Makefile | 10 +++++++--- Makefile.variables | 2 ++ hack/lint/Dockerfile | 5 +++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f76386bc..0026f195b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ # Build the manager binary -FROM golang:1.20 as builder +ARG BUILD_IMG ARG TARGETOS ARG TARGETARCH +FROM ${BUILD_IMG} as builder + WORKDIR /workspace # Copy the Go Modules manifests COPY go.mod go.mod diff --git a/Makefile b/Makefile index 887408df8..b679270b5 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,10 @@ run: manifests generate fmt vet ## Run a controller from your host. # More info: https://docs.docker.com/develop/develop-images/build_enhancements/ .PHONY: docker-build docker-build: test ## Build docker image with the manager. - docker build -t ${IMG} . + docker build \ + -t ${IMG} \ + --build-arg BUILD_IMG=golang:$(GO_VERSION) \ + . k0smotron-image-bundle.tar: docker-build docker save ${IMG} -o k0smotron-image-bundle.tar @@ -195,10 +198,11 @@ clean: k0smotron-image-bundle.tar \ $(LOCALBIN) -hack/lint/.golangci-lint.stamp: hack/lint/Dockerfile +hack/lint/.golangci-lint.stamp: hack/lint/Dockerfile Makefile.variables docker build \ -t k0smotron.golangci-lint \ - --build-arg GOLANGCILINT_VERSION=1.52.2 \ + --build-arg BUILD_IMG=golang:$(GO_VERSION) \ + --build-arg GOLANGCILINT_VERSION=$(GOLANGCILINT_VERSION) \ -f hack/lint/Dockerfile \ . touch -- '$@' diff --git a/Makefile.variables b/Makefile.variables index 9885c89d8..5479b6d91 100644 --- a/Makefile.variables +++ b/Makefile.variables @@ -1,2 +1,4 @@ KUSTOMIZE_VERSION ?= v5.0.1 CONTROLLER_TOOLS_VERSION ?= v0.11.4 +GO_VERSION ?= 1.20.4 +GOLANGCILINT_VERSION ?= 1.52.2 diff --git a/hack/lint/Dockerfile b/hack/lint/Dockerfile index bf1438b62..f2aa0e131 100644 --- a/hack/lint/Dockerfile +++ b/hack/lint/Dockerfile @@ -1,5 +1,6 @@ -FROM golang:1.20 as builder +ARG BUILD_IMG +FROM ${BUILD_IMG} as builder ARG GOLANGCILINT_VERSION -RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v${GOLANGCILINT_VERSION} \ No newline at end of file +RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v${GOLANGCILINT_VERSION}