From 4ae2c92750603d1cb8ad50a27dd01291f26bf1f7 Mon Sep 17 00:00:00 2001 From: Tarun Gupta Akirala Date: Tue, 1 Oct 2024 10:41:23 -0700 Subject: [PATCH] ci: bump dockerfile golang version (#154) (#155) --- Dockerfile.ci | 7 +++++-- make/ci.mk | 2 +- make/tools.mk | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 69debdd0..fd9b19e6 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -6,13 +6,16 @@ RUN apt-get update && apt-get install -y \ bzip2 \ git \ build-essential \ - python-dev \ + python-dev-is-python3 \ python3 \ python3-pip \ shellcheck \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install --upgrade pre-commit yamale yamllint awscli gitlint +# The sole purpose of docker image is to run CI jobs and thus we never have more than one version of python and +# it is fine to break any packages installed by apt with same name. +# If `--break-system-packages` is removed, we need to use virtual env. (See related https://peps.python.org/pep-0668/) +RUN pip3 install --break-system-packages --upgrade pre-commit yamale yamllint awscli gitlint ARG DOCKER_VERSION RUN curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | \ diff --git a/make/ci.mk b/make/ci.mk index 62c76b49..cc76469c 100644 --- a/make/ci.mk +++ b/make/ci.mk @@ -6,7 +6,7 @@ CI_DOCKER_TAG ?= $(shell (cat $(CI_DOCKERFILE) $(CI_DOCKER_EXTRA_FILES) \ | shasum | awk '{ print $$1 }') CI_DOCKER_IMG ?= $(GITHUB_ORG)/$(GITHUB_REPOSITORY)-ci:$(CI_DOCKER_TAG) -export GOLANG_VERSION ?= 1.19.1 +export GOLANG_VERSION ?= 1.23.0 DOCKER_VERSION ?= 20.10.7 .PHONY: dockerauth diff --git a/make/tools.mk b/make/tools.mk index 86bcf200..8289dfa7 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -29,9 +29,7 @@ $(GOJQ_BIN): .PHONY: kommander-cli kommander-cli: $(call print-target) - go install golang.org/dl/go1.19@latest - go1.19 download - CGO_ENABLED=0 go1.19 install github.com/mesosphere/kommander-cli/v2@$(KOMMANDER_CLI_VERSION) + CGO_ENABLED=0 go install github.com/mesosphere/kommander-cli/v2@$(KOMMANDER_CLI_VERSION) .PHONY: gh-dkp gh-dkp: ; $(info $(M) installing $*)