images: update cilium-{runtime,builder}

Signed-off-by: Joe Stringer <joe@cilium.io>
cilium · Jan 18, 2023 · 23ef49e · 23ef49e
1 parent f46fdc0
commit 23ef49e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build-images-ci.yaml b/.github/workflows/build-images-ci.yaml
@@ -172,7 +172,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:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}
@@ -287,7 +287,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:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}

diff --git 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:80de9bcdb71b0cc1cad2faadea0a8248bc00e3e2@sha256:b2085a251b3b61a54d94acad9ae449bda13ee01a616ec583b224b7f2edd2848d
+CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:70625c0ba01544e4d88824dbef4efe564a19bf57@sha256:7b1f5b903018fe4519835d1aab62503de748c28bba1ea1b9af730483072400c0
 
 .PHONY: proto
 proto:

diff --git 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:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139
 ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
 ARG GOLANG_IMAGE=docker.io/library/golang:1.19.3@sha256:10e3c0f39f8e237baa5b66c5295c578cac42a99536cc9333d8505324a82407d9
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:3408daa17f6490a464dfc746961e28ae31964c66@sha256:ff13a1a9f973d102c6ac907d2bc38a524c8e1d26c6c1b16ed809a98925206a79

diff --git 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:80de9bcdb71b0cc1cad2faadea0a8248bc00e3e2@sha256:b2085a251b3b61a54d94acad9ae449bda13ee01a616ec583b224b7f2edd2848d
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:70625c0ba01544e4d88824dbef4efe564a19bf57@sha256:7b1f5b903018fe4519835d1aab62503de748c28bba1ea1b9af730483072400c0
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139
 
 # cilium-envoy from github.com/cilium/proxy
 #

diff --git a/images/runtime/Dockerfile b/images/runtime/Dockerfile
@@ -29,7 +29,7 @@ FROM ${UBUNTU_IMAGE} as rootfs
 
 # Change the number to force the generation of a new git-tree SHA. Useful when
 # we want to re-run 'apt-get upgrade' for stale images.
-ENV FORCE_BUILD=2
+ENV FORCE_BUILD=3
 
 # Update ubuntu packages to the most recent versions
 RUN apt-get update && \

diff --git a/jenkinsfiles/ginkgo-gke.Jenkinsfile b/jenkinsfiles/ginkgo-gke.Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139"
                     }
                 }
             }

diff --git a/jenkinsfiles/ginkgo-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-kernel.Jenkinsfile
@@ -97,7 +97,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139"
                     }
                 }
             }

diff --git a/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
             )}"""
         BASE_IMAGE="""${sh(
                 returnStdout: true,
-                script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19"; fi'
+                script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139"; fi'
             )}"""
     }
 

diff --git a/jenkinsfiles/kubernetes-upstream.Jenkinsfile b/jenkinsfiles/kubernetes-upstream.Jenkinsfile
@@ -60,7 +60,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:2c39e89fbabb2e2f13263482d340a30964825752@sha256:c8f9a9331ceb77c796d0cd72fa3a9c199f355ff35c17af4bef5207427a8f1139"
                     }
                 }
             }

diff --git 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:80de9bcdb71b0cc1cad2faadea0a8248bc00e3e2@sha256:b2085a251b3b61a54d94acad9ae449bda13ee01a616ec583b224b7f2edd2848d
+    image: quay.io/cilium/cilium-builder:70625c0ba01544e4d88824dbef4efe564a19bf57@sha256:7b1f5b903018fe4519835d1aab62503de748c28bba1ea1b9af730483072400c0
     workingDir: /cilium
     command: ["sleep"]
     args: