chore: update to dev-tools 1.18 on Alpine 3.19 with GO 1.21 (#2023)

GoogleCloudPlatform · Dec 8, 2023 · d5468a3 · d5468a3
1 parent 56012c6
commit d5468a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/infra/build/Makefile b/infra/build/Makefile
@@ -41,7 +41,7 @@ KUBECTL_VERSION := 1.26.11
 # Updated by Update Tooling Workflow
 TFLINT_VERSION := 0.49.0
 TINKEY_VERSION := 1.7.0
-ALPINE_VERSION := 3.18
+ALPINE_VERSION := 3.19
 # Updated by Update Tooling Workflow
 MODULE_SWAPPER_VERSION := 0.2.5
 
@@ -55,7 +55,7 @@ OPA_VERSION := 0.52.0
 # Updated by Update Tooling Workflow
 GCRANE_VERSION := 0.17.0
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17.9
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.18.0
 DOCKER_TAG_MAJOR_VERSION_DEVELOPER_TOOLS := $(firstword $(subst ., , $(DOCKER_TAG_VERSION_DEVELOPER_TOOLS)))
 DOCKER_TAG_MINOR_VERSION_DEVELOPER_TOOLS := $(shell echo "${DOCKER_TAG_VERSION_DEVELOPER_TOOLS}" | awk -F. '{print $$1"."$$2}')
 

diff --git a/infra/build/developer-tools-krm/Dockerfile b/infra/build/developer-tools-krm/Dockerfile
@@ -15,7 +15,7 @@
 ARG BASE_IMAGE_VERSION
 FROM cft/developer-tools:$BASE_IMAGE_VERSION
 
-RUN apk update && apk add --no-cache openrc docker-cli docker screen nodejs-current npm yamllint util-linux-misc libc6-compat ansible-lint py3-jsonschema
+RUN apk update && apk add --no-cache openrc docker-cli docker screen nodejs-current npm yamllint util-linux-misc libc6-compat ansible-lint py3-jsonschema pipx
 
 # Required to download and install golangci-lint
 ARG GOLANGCI_VERSION
@@ -67,4 +67,4 @@ ADD ./build/scripts/prow_entrypoint.sh /usr/local/bin/
 
 # cookiecutter is used for terraform-google-module-template tests
 # https://github.com/terraform-google-modules/terraform-google-module-template
-RUN pip install cookiecutter
+RUN pipx install cookiecutter