diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index aef82fb103cd4..d691143466741 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Cilium", - "image": "quay.io/cilium/cilium-builder:a441e5589dae91ba5d875a0787e08a698d1ca29a@sha256:cd6b5c3386b52fafa11980de65202aafe15878a0803012ab7370ac7b6efca8a6", + "image": "quay.io/cilium/cilium-builder:622fab921378824d2264c3cf9b8b07c22e490132@sha256:33f7ec692ade2b4a8b352876764f59a9b2dd214d4affdf61526b8f3f7201c5ef", "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 1b23a796758bd..8999804d4aa1c 100644 --- a/.github/workflows/build-images-ci.yaml +++ b/.github/workflows/build-images-ci.yaml @@ -211,7 +211,7 @@ jobs: tags: ${{ steps.tag.outputs.race_tag }} target: release build-args: | - BASE_IMAGE=quay.io/cilium/cilium-runtime:688034e1311f8fce5ddfdc5bf13c8e43ab4e5aa2@sha256:b0d38eec1ea487f7d2a51d5f26be5c8a76abff1be0434e9db45a85c5a9e20f8f + BASE_IMAGE=quay.io/cilium/cilium-runtime:9b46aeb2e1e88a2290bc7a199e8f0be916c7b3dd@sha256:f521957bedf675bd5e358896f9c1a7fc807fdeb75933126a33b2a562a07ad9ce LOCKDEBUG=1 RACE=1 OPERATOR_VARIANT=${{ matrix.name }} diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index d562d1e2c6706..e8fafb60804f8 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:688034e1311f8fce5ddfdc5bf13c8e43ab4e5aa2@sha256:b0d38eec1ea487f7d2a51d5f26be5c8a76abff1be0434e9db45a85c5a9e20f8f +ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:9b46aeb2e1e88a2290bc7a199e8f0be916c7b3dd@sha256:f521957bedf675bd5e358896f9c1a7fc807fdeb75933126a33b2a562a07ad9ce ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73 ARG GOLANG_IMAGE=docker.io/library/golang:1.22.11@sha256:9243159d3e5faf8a8576fa74d2cae9970b3e57b93b30cf34266e04b30776b706 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:a8c542efc076b62ba683e7699c0013adb6955f0f@sha256:38e8941107bd19eb30bdde6e478760a22325f38d1f2771dfd1b9af81d74235e7 diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile index 886cf4842a4ef..ab2e846b1916e 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:a441e5589dae91ba5d875a0787e08a698d1ca29a@sha256:cd6b5c3386b52fafa11980de65202aafe15878a0803012ab7370ac7b6efca8a6 -ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:688034e1311f8fce5ddfdc5bf13c8e43ab4e5aa2@sha256:b0d38eec1ea487f7d2a51d5f26be5c8a76abff1be0434e9db45a85c5a9e20f8f +ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:622fab921378824d2264c3cf9b8b07c22e490132@sha256:33f7ec692ade2b4a8b352876764f59a9b2dd214d4affdf61526b8f3f7201c5ef +ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:9b46aeb2e1e88a2290bc7a199e8f0be916c7b3dd@sha256:f521957bedf675bd5e358896f9c1a7fc807fdeb75933126a33b2a562a07ad9ce # # cilium-envoy from github.com/cilium/proxy # diff --git a/images/operator/Dockerfile b/images/operator/Dockerfile index 22bf9938d2130..41ad7bc944896 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.22.11@sha256:9243159d3e5faf8a8576fa74d2cae9970b3e57b93b30cf34266e04b30776b706 ARG ALPINE_IMAGE=docker.io/library/alpine:3.18.11@sha256:dd60c75fba961ecc5e918961c713f3c42dd5665171c58f9b2ef5aafe081ad5a0 -ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:a441e5589dae91ba5d875a0787e08a698d1ca29a@sha256:cd6b5c3386b52fafa11980de65202aafe15878a0803012ab7370ac7b6efca8a6 +ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:622fab921378824d2264c3cf9b8b07c22e490132@sha256:33f7ec692ade2b4a8b352876764f59a9b2dd214d4affdf61526b8f3f7201c5ef # 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/jenkinsfiles/kubernetes-upstream.Jenkinsfile b/jenkinsfiles/kubernetes-upstream.Jenkinsfile index 80ea4d84c2311..f17c4e1d107fb 100644 --- a/jenkinsfiles/kubernetes-upstream.Jenkinsfile +++ b/jenkinsfiles/kubernetes-upstream.Jenkinsfile @@ -59,7 +59,7 @@ pipeline { env.DOCKER_TAG = env.DOCKER_TAG + "-race" env.RACE = 1 env.LOCKDEBUG = 1 - env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:688034e1311f8fce5ddfdc5bf13c8e43ab4e5aa2@sha256:b0d38eec1ea487f7d2a51d5f26be5c8a76abff1be0434e9db45a85c5a9e20f8f" + env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:9b46aeb2e1e88a2290bc7a199e8f0be916c7b3dd@sha256:f521957bedf675bd5e358896f9c1a7fc807fdeb75933126a33b2a562a07ad9ce" } } } diff --git a/test/k8s/manifests/demo-customcalls.yaml b/test/k8s/manifests/demo-customcalls.yaml index 653cb4e97ecbb..a142c86e3671b 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:a441e5589dae91ba5d875a0787e08a698d1ca29a@sha256:cd6b5c3386b52fafa11980de65202aafe15878a0803012ab7370ac7b6efca8a6 + image: quay.io/cilium/cilium-builder:622fab921378824d2264c3cf9b8b07c22e490132@sha256:33f7ec692ade2b4a8b352876764f59a9b2dd214d4affdf61526b8f3f7201c5ef workingDir: /cilium command: ["/bin/sh", "-c"] args: