From 1c0c9bbd96c8d36852422312c7a0dde6a62cfa1b Mon Sep 17 00:00:00 2001 From: Cilium Imagebot Date: Fri, 16 Feb 2024 14:30:46 +0000 Subject: [PATCH] images: update cilium-{runtime,builder} Signed-off-by: Cilium Imagebot --- .devcontainer/devcontainer.json | 2 +- .github/workflows/build-images-ci.yaml | 4 ++-- api/v1/Makefile | 2 +- images/builder/Dockerfile | 2 +- images/cilium/Dockerfile | 4 ++-- images/hubble-relay/Dockerfile | 2 +- images/operator/Dockerfile | 2 +- test/k8s/manifests/demo-customcalls.yaml | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5a9087a1cb75f..d55a6f5285b73 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Cilium", - "image": "quay.io/cilium/cilium-builder:8bcfaa707c3b7e71ada1c0329973791a830f1328@sha256:c59ffae4a2e7becf7fb23f8e66f0d825f700961131fd6466fefe5ad39263d85f", + "image": "quay.io/cilium/cilium-builder:af7ae6ffb3a21f8b5bb06d90fdcd1a08405a975f@sha256:d7a34eaeb5d1e4c6e53ceec7cd26d76907c73a4085483ed9036711b30494a645", "workspaceFolder": "/go/src/github.com/cilium/cilium", "workspaceMount": "source=${localWorkspaceFolder},target=/go/src/github.com/cilium/cilium,type=bind", "features": { diff --git a/.github/workflows/build-images-ci.yaml b/.github/workflows/build-images-ci.yaml index 02e06eb18e4fe..bba33c02a73d9 100644 --- a/.github/workflows/build-images-ci.yaml +++ b/.github/workflows/build-images-ci.yaml @@ -177,7 +177,7 @@ jobs: quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race target: release build-args: | - BASE_IMAGE=quay.io/cilium/cilium-runtime:b36e2cbcb2530fb1dc8e8ee16d8ed522c3227263@sha256:1c91cc209ebb274a0b65d95f0a4592abbc852760c029b2554f20e5a87ba425aa + BASE_IMAGE=quay.io/cilium/cilium-runtime:1e54c708a917bafa63f2df5164ba3ed1c5a3b6bb@sha256:ddfb1623c26ed1d16d4c0af798190171807beb6628fb808df82d6d6d96b54040 LOCKDEBUG=1 RACE=1 OPERATOR_VARIANT=${{ matrix.name }} @@ -311,7 +311,7 @@ jobs: quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race target: release build-args: | - BASE_IMAGE=quay.io/cilium/cilium-runtime:b36e2cbcb2530fb1dc8e8ee16d8ed522c3227263@sha256:1c91cc209ebb274a0b65d95f0a4592abbc852760c029b2554f20e5a87ba425aa + BASE_IMAGE=quay.io/cilium/cilium-runtime:1e54c708a917bafa63f2df5164ba3ed1c5a3b6bb@sha256:ddfb1623c26ed1d16d4c0af798190171807beb6628fb808df82d6d6d96b54040 LOCKDEBUG=1 RACE=1 OPERATOR_VARIANT=${{ matrix.name }} diff --git a/api/v1/Makefile b/api/v1/Makefile index 5f86abe9aaca6..9f20876f80dbb 100644 --- a/api/v1/Makefile +++ b/api/v1/Makefile @@ -3,7 +3,7 @@ include ../../Makefile.defs # Update this via images/scripts/update-cilium-builder-image.sh -CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:8bcfaa707c3b7e71ada1c0329973791a830f1328@sha256:c59ffae4a2e7becf7fb23f8e66f0d825f700961131fd6466fefe5ad39263d85f +CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:af7ae6ffb3a21f8b5bb06d90fdcd1a08405a975f@sha256:d7a34eaeb5d1e4c6e53ceec7cd26d76907c73a4085483ed9036711b30494a645 .PHONY: proto proto: diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index b789e41ba1b94..c49e48c31b5cd 100644 --- a/images/builder/Dockerfile +++ b/images/builder/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:5569a29cea6b3ad50aeb03102aaf3dc03841197c@sha256:b15dbedb7c49816c74a765e2f6ecdb9359763b8e4e4328d794f48b9cefae9804 -ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:b36e2cbcb2530fb1dc8e8ee16d8ed522c3227263@sha256:1c91cc209ebb274a0b65d95f0a4592abbc852760c029b2554f20e5a87ba425aa +ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1e54c708a917bafa63f2df5164ba3ed1c5a3b6bb@sha256:ddfb1623c26ed1d16d4c0af798190171807beb6628fb808df82d6d6d96b54040 ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73 ARG GOLANG_IMAGE=docker.io/library/golang:1.21.7@sha256:b7bac393658f891b69189cfd98111525f951ac0fec8bab97a1990fe43c85d342 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:a8c542efc076b62ba683e7699c0013adb6955f0f@sha256:38e8941107bd19eb30bdde6e478760a22325f38d1f2771dfd1b9af81d74235e7 diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile index 3417b10e053b1..364b39bc099dd 100644 --- a/images/cilium/Dockerfile +++ b/images/cilium/Dockerfile @@ -1,8 +1,8 @@ # Copyright Authors of Cilium # SPDX-License-Identifier: Apache-2.0 -ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:8bcfaa707c3b7e71ada1c0329973791a830f1328@sha256:c59ffae4a2e7becf7fb23f8e66f0d825f700961131fd6466fefe5ad39263d85f -ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:b36e2cbcb2530fb1dc8e8ee16d8ed522c3227263@sha256:1c91cc209ebb274a0b65d95f0a4592abbc852760c029b2554f20e5a87ba425aa +ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:af7ae6ffb3a21f8b5bb06d90fdcd1a08405a975f@sha256:d7a34eaeb5d1e4c6e53ceec7cd26d76907c73a4085483ed9036711b30494a645 +ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1e54c708a917bafa63f2df5164ba3ed1c5a3b6bb@sha256:ddfb1623c26ed1d16d4c0af798190171807beb6628fb808df82d6d6d96b54040 # cilium-envoy from github.com/cilium/proxy # diff --git a/images/hubble-relay/Dockerfile b/images/hubble-relay/Dockerfile index 4bf3dc66f4449..a2e0c6a18e481 100644 --- a/images/hubble-relay/Dockerfile +++ b/images/hubble-relay/Dockerfile @@ -12,7 +12,7 @@ # https://raw.githubusercontent.com/GoogleContainerTools/distroless/main/cosign.pub ARG BASE_IMAGE=gcr.io/distroless/static-debian11:nonroot@sha256:112a87f19e83c83711cc81ce8ed0b4d79acd65789682a6a272df57c4a0858534 ARG GOLANG_IMAGE=docker.io/library/golang:1.21.7@sha256:b7bac393658f891b69189cfd98111525f951ac0fec8bab97a1990fe43c85d342 -ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:8bcfaa707c3b7e71ada1c0329973791a830f1328@sha256:c59ffae4a2e7becf7fb23f8e66f0d825f700961131fd6466fefe5ad39263d85f +ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:af7ae6ffb3a21f8b5bb06d90fdcd1a08405a975f@sha256:d7a34eaeb5d1e4c6e53ceec7cd26d76907c73a4085483ed9036711b30494a645 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. # Represents the plataform where the build is happening, do not mix with diff --git a/images/operator/Dockerfile b/images/operator/Dockerfile index e1713cc138feb..7a2b1af63babc 100644 --- a/images/operator/Dockerfile +++ b/images/operator/Dockerfile @@ -4,7 +4,7 @@ ARG BASE_IMAGE=scratch ARG GOLANG_IMAGE=docker.io/library/golang:1.21.7@sha256:b7bac393658f891b69189cfd98111525f951ac0fec8bab97a1990fe43c85d342 ARG ALPINE_IMAGE=docker.io/library/alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b -ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:8bcfaa707c3b7e71ada1c0329973791a830f1328@sha256:c59ffae4a2e7becf7fb23f8e66f0d825f700961131fd6466fefe5ad39263d85f +ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:af7ae6ffb3a21f8b5bb06d90fdcd1a08405a975f@sha256:d7a34eaeb5d1e4c6e53ceec7cd26d76907c73a4085483ed9036711b30494a645 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit. # Represents the plataform where the build is happening, do not mix with diff --git a/test/k8s/manifests/demo-customcalls.yaml b/test/k8s/manifests/demo-customcalls.yaml index 4338eacd0039b..189d6bcb062a0 100644 --- a/test/k8s/manifests/demo-customcalls.yaml +++ b/test/k8s/manifests/demo-customcalls.yaml @@ -99,7 +99,7 @@ metadata: spec: containers: - name: cilium-builder - image: quay.io/cilium/cilium-builder:8bcfaa707c3b7e71ada1c0329973791a830f1328@sha256:c59ffae4a2e7becf7fb23f8e66f0d825f700961131fd6466fefe5ad39263d85f + image: quay.io/cilium/cilium-builder:af7ae6ffb3a21f8b5bb06d90fdcd1a08405a975f@sha256:d7a34eaeb5d1e4c6e53ceec7cd26d76907c73a4085483ed9036711b30494a645 workingDir: /cilium command: ["/bin/sh", "-c"] args: