From de6440e5a3dd38551124a75f813642f9ce4a1eb2 Mon Sep 17 00:00:00 2001 From: "cilium-renovate[bot]" <134692979+cilium-renovate[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 11:06:15 +0000 Subject: [PATCH] chore(deps): update docker.io/library/golang docker tag to v1.21.6 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 +- Makefile.cli | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5628e37d28e..26271d70284 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.5@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 as tetragon-builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.6@sha256:6fbd2d3398db924f8d708cf6e94bd3a436bb468195daa6a96e80504e0a9615f2 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.5-alpine@sha256:4db4aac30880b978cae5445dd4a706215249ad4f43d28bd7cdf7906e9be8dd6b as gops +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21.6-alpine@sha256:fd78f2fb1e49bcf343079bbbb851c936a18fc694df993cbddaa24ace0cc724c5 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 a0c3f38dbb7..1355238c930 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.5@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 +FROM docker.io/library/golang:1.21.6@sha256:6fbd2d3398db924f8d708cf6e94bd3a436bb468195daa6a96e80504e0a9615f2 RUN apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y \ diff --git a/Dockerfile.operator b/Dockerfile.operator index 003d90bfd5b..a4ad4d8c0e2 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.5@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 +ARG GOLANG_IMAGE=docker.io/library/golang:1.21.6@sha256:6fbd2d3398db924f8d708cf6e94bd3a436bb468195daa6a96e80504e0a9615f2 ARG ALPINE_IMAGE=docker.io/library/alpine:3.19.0@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. diff --git a/Dockerfile.test b/Dockerfile.test index 69acde52cb5..fde455dd2ef 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.5@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 +FROM docker.io/library/golang:1.21.6@sha256:6fbd2d3398db924f8d708cf6e94bd3a436bb468195daa6a96e80504e0a9615f2 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 59362d1899d..4b473e1dca0 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.5-alpine +GO_IMAGE = docker.io/library/golang:1.21.6-alpine TARGET=tetra RELEASE_UID ?= $(shell id -u)