diff --git a/.github/renovate.json5 b/.github/renovate.json5 index cbc424b341c..182124e84e5 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -206,7 +206,7 @@ // cases it might not be preinstalled, see: // https://github.com/renovatebot/renovate/discussions/23485 // renovate: datasource=golang-version depName=go - "commands": ["install-tool golang 1.21.1", "go mod vendor"], + "commands": ["install-tool golang 1.21.2", "go mod vendor"], "fileFilters": ["**/**"], "executionMode": "branch" }, diff --git a/Dockerfile b/Dockerfile index 2392d82a498..a90cf3f996a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN make tetragon-bpf LOCAL_CLANG=1 TARGET_ARCH=$TARGETARCH # Second builder (cross-)compile: # - tetragon (pkg/bpf uses CGO, so a gcc cross compiler is needed) # - tetra -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.1@sha256:19600fdcae402165dcdab18cb9649540bde6be7274dedb5d205b2f84029fe909 as tetragon-builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.2@sha256:e9ebfe932adeff65af5338236f0b0604c86b143c1bff3e1d0551d8f6196ab5c5 as tetragon-builder WORKDIR /go/src/github.com/cilium/tetragon ARG TETRAGON_VERSION TARGETARCH BUILDARCH RUN apt-get update @@ -33,7 +33,7 @@ RUN if [ $BUILDARCH != $TARGETARCH ]; \ else make tetragon-image LOCAL_CLANG=1 VERSION=$TETRAGON_VERSION TARGET_ARCH=$TARGETARCH; fi # Third builder (cross-)compile a stripped gops -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.1-alpine@sha256:1c9cc949513477766da12bfa80541c4f24957323b0ee00630a6ff4ccf334b75b as gops +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.2-alpine@sha256:a76f153cff6a59112777c071b0cde1b6e4691ddc7f172be424228da1bfb7bbda as gops ARG TARGETARCH RUN apk add --no-cache binutils git \ && git clone https://github.com/google/gops /go/src/github.com/google/gops \ diff --git a/Dockerfile.dev b/Dockerfile.dev index 40fe5dd1f2b..813fa036e08 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -9,7 +9,7 @@ FROM quay.io/cilium/cilium-bpftool@sha256:1832b32d118e7006ea2ce530b14ae5b28acd55 COPY . ./ -FROM docker.io/library/golang:1.21.1@sha256:19600fdcae402165dcdab18cb9649540bde6be7274dedb5d205b2f84029fe909 +FROM docker.io/library/golang:1.21.2@sha256:e9ebfe932adeff65af5338236f0b0604c86b143c1bff3e1d0551d8f6196ab5c5 RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y \ diff --git a/Dockerfile.operator b/Dockerfile.operator index c207cfce863..97b504cfca8 100644 --- a/Dockerfile.operator +++ b/Dockerfile.operator @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 ARG BASE_IMAGE=scratch -ARG GOLANG_IMAGE=docker.io/library/golang:1.21.1@sha256:19600fdcae402165dcdab18cb9649540bde6be7274dedb5d205b2f84029fe909 +ARG GOLANG_IMAGE=docker.io/library/golang:1.21.2@sha256:e9ebfe932adeff65af5338236f0b0604c86b143c1bff3e1d0551d8f6196ab5c5 ARG ALPINE_IMAGE=docker.io/library/alpine:3.18.4@sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. diff --git a/Dockerfile.test b/Dockerfile.test index 813356a88e8..e92dccb5902 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -11,7 +11,7 @@ RUN apt-get install -y linux-libc-dev COPY . ./ RUN make tetragon-bpf && pwd -FROM docker.io/library/golang:1.21.1@sha256:19600fdcae402165dcdab18cb9649540bde6be7274dedb5d205b2f84029fe909 +FROM docker.io/library/golang:1.21.2@sha256:e9ebfe932adeff65af5338236f0b0604c86b143c1bff3e1d0551d8f6196ab5c5 RUN apt-get update RUN apt-get install -y linux-libc-dev rpm2cpio cpio git flex bison autoconf libelf-dev bc netcat-traditional WORKDIR /go/src/github.com/cilium/tetragon diff --git a/Makefile.cli b/Makefile.cli index 36a2565edfc..4bef489d8d5 100644 --- a/Makefile.cli +++ b/Makefile.cli @@ -3,7 +3,7 @@ CLI_GO_BUILD = CGO_ENABLED=0 $(GO) build # renovate: datasource=docker -GO_IMAGE = docker.io/library/golang:1.21.1-alpine +GO_IMAGE = docker.io/library/golang:1.21.2-alpine TARGET=tetra RELEASE_UID ?= $(shell id -u)