From 8e7bc6df51d5cc674aff49970b3462739473a40b Mon Sep 17 00:00:00 2001 From: "cilium-renovate[bot]" <134692979+cilium-renovate[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 10:13:37 +0000 Subject: [PATCH] chore(deps): update go Signed-off-by: cilium-renovate[bot] <134692979+cilium-renovate[bot]@users.noreply.github.com> --- Dockerfile | 4 ++-- Dockerfile.dev | 2 +- Dockerfile.operator | 2 +- Dockerfile.test | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 737c04c981a..e697609166b 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.10@sha256:392d2b634cba642c48e23b22949af823d42f4e722ca2d9f519133445e5a4cbba as tetragon-builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.10@sha256:16438a8e66c0c984f732e815ee5b7d715b8e33e81bac6d6a3750b1067744e7ca 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.10-alpine@sha256:b3aea8df13191dab7d2e44a7fbc51d7b09bb796547127da8d74cfb81e5d65923 as gops +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.10-alpine@sha256:1c2e4747a1b15fe65c8317bca9bd91611b29fe7c8b65009b9edbee7653e62614 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 c2cbbe22aa0..d6c8cfe24fd 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.10@sha256:392d2b634cba642c48e23b22949af823d42f4e722ca2d9f519133445e5a4cbba +FROM docker.io/library/golang:1.21.10@sha256:16438a8e66c0c984f732e815ee5b7d715b8e33e81bac6d6a3750b1067744e7ca RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y \ diff --git a/Dockerfile.operator b/Dockerfile.operator index 0dd9e9c9f2b..233147a483e 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.10@sha256:392d2b634cba642c48e23b22949af823d42f4e722ca2d9f519133445e5a4cbba +ARG GOLANG_IMAGE=docker.io/library/golang:1.21.10@sha256:16438a8e66c0c984f732e815ee5b7d715b8e33e81bac6d6a3750b1067744e7ca ARG ALPINE_IMAGE=docker.io/library/alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. diff --git a/Dockerfile.test b/Dockerfile.test index 5182c6172d8..26d7dcafb13 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.10@sha256:392d2b634cba642c48e23b22949af823d42f4e722ca2d9f519133445e5a4cbba +FROM docker.io/library/golang:1.21.10@sha256:16438a8e66c0c984f732e815ee5b7d715b8e33e81bac6d6a3750b1067744e7ca 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