diff --git a/Dockerfile b/Dockerfile index 69fbeb3e32a..9f63a642eec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,14 +18,14 @@ ARG TARGETARCH RUN make tetragon-bpf LOCAL_CLANG=1 TARGET_ARCH=$TARGETARCH # Second builder (cross-)compile tetragon and tetra -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22.5@sha256:829eff99a4b2abffe68f6a3847337bf6455d69d17e49ec1a97dac78834754bd6 AS tetragon-builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22.5@sha256:86a3c48a61915a8c62c0e1d7594730399caa3feb73655dfe96c7bc17710e96cf AS tetragon-builder WORKDIR /go/src/github.com/cilium/tetragon ARG TETRAGON_VERSION TARGETARCH COPY . . RUN make VERSION=$TETRAGON_VERSION TARGET_ARCH=$TARGETARCH tetragon tetra tetragon-oci-hook tetragon-oci-hook-setup # Third builder (cross-)compile a stripped gops -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22.5-alpine@sha256:8c9183f715b0b4eca05b8b3dbf59766aaedb41ec07477b132ee2891ac0110a07 AS gops +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22.5-alpine@sha256:0d3653dd6f35159ec6e3d10263a42372f6f194c3dea0b35235d72aabde86486e AS gops ARG TARGETARCH RUN apk add --no-cache git \ # renovate: datasource=github-releases depName=google/gops diff --git a/Dockerfile.dev b/Dockerfile.dev index a97281764ef..60fdcdc3cb1 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.22.5@sha256:829eff99a4b2abffe68f6a3847337bf6455d69d17e49ec1a97dac78834754bd6 +FROM docker.io/library/golang:1.22.5@sha256:86a3c48a61915a8c62c0e1d7594730399caa3feb73655dfe96c7bc17710e96cf RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y \ diff --git a/Dockerfile.operator b/Dockerfile.operator index 42a4f5588cb..8c33796aa0f 100644 --- a/Dockerfile.operator +++ b/Dockerfile.operator @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 ARG BASE_IMAGE=scratch -ARG GOLANG_IMAGE=docker.io/library/golang:1.22.5@sha256:829eff99a4b2abffe68f6a3847337bf6455d69d17e49ec1a97dac78834754bd6 +ARG GOLANG_IMAGE=docker.io/library/golang:1.22.5@sha256:86a3c48a61915a8c62c0e1d7594730399caa3feb73655dfe96c7bc17710e96cf ARG ALPINE_IMAGE=docker.io/library/alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. diff --git a/Dockerfile.rthooks b/Dockerfile.rthooks index bf640f4113d..dd580f05e8f 100644 --- a/Dockerfile.rthooks +++ b/Dockerfile.rthooks @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -ARG GOLANG_IMAGE=docker.io/library/golang:1.22.5@sha256:829eff99a4b2abffe68f6a3847337bf6455d69d17e49ec1a97dac78834754bd6 +ARG GOLANG_IMAGE=docker.io/library/golang:1.22.5@sha256:86a3c48a61915a8c62c0e1d7594730399caa3feb73655dfe96c7bc17710e96cf ARG BASE_IMAGE=docker.io/library/alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. diff --git a/Dockerfile.test b/Dockerfile.test index ac533950444..56a8cd81ff1 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.22.5@sha256:829eff99a4b2abffe68f6a3847337bf6455d69d17e49ec1a97dac78834754bd6 +FROM docker.io/library/golang:1.22.5@sha256:86a3c48a61915a8c62c0e1d7594730399caa3feb73655dfe96c7bc17710e96cf 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 bad8cb6e222..176ae0c7f8b 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.22.5-alpine@sha256:8c9183f715b0b4eca05b8b3dbf59766aaedb41ec07477b132ee2891ac0110a07 +GO_IMAGE = docker.io/library/golang:1.22.5-alpine@sha256:0d3653dd6f35159ec6e3d10263a42372f6f194c3dea0b35235d72aabde86486e TARGET=tetra RELEASE_UID ?= $(shell id -u) diff --git a/pkg/k8s/Makefile b/pkg/k8s/Makefile index 5154bb1d001..81228ffa57f 100644 --- a/pkg/k8s/Makefile +++ b/pkg/k8s/Makefile @@ -1,5 +1,5 @@ # renovate: datasource=docker -BUILDER_IMAGE=docker.io/library/golang:1.22.5@sha256:829eff99a4b2abffe68f6a3847337bf6455d69d17e49ec1a97dac78834754bd6 +BUILDER_IMAGE=docker.io/library/golang:1.22.5@sha256:86a3c48a61915a8c62c0e1d7594730399caa3feb73655dfe96c7bc17710e96cf GO ?= go all: generate