Skip to content

Commit

Permalink
images: update cilium-{runtime,builder}
Browse files Browse the repository at this point in the history
Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Mar 12, 2024
1 parent bade091 commit a58e3f4
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-images-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,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:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a
BASE_IMAGE=quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down Expand Up @@ -260,7 +260,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:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a
BASE_IMAGE=quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down
2 changes: 1 addition & 1 deletion api/v1/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:bf0a07887573b8362c8bf0e71f161da20c6d87f1@sha256:b82cdd3174e42771c97dc06658b3c0cdac89f81f834db06dafa4e96527f4039a
CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:9f4a2d2a7c7e719011bdc5ad519852313252ff82@sha256:8cddd001b75acaa624cdcef3dd37d9dba1a3117b80de46f238fdb969c6746fb9

.PHONY: proto
proto:
Expand Down
2 changes: 1 addition & 1 deletion images/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88
ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG GOLANG_IMAGE=docker.io/library/golang:1.21.8@sha256:c82d4ad02c062cf2b393bf0374df26638c6fed3dfe52cdbd3635d4a7befab86e
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:3408daa17f6490a464dfc746961e28ae31964c66@sha256:ff13a1a9f973d102c6ac907d2bc38a524c8e1d26c6c1b16ed809a98925206a79
Expand Down
4 changes: 2 additions & 2 deletions images/cilium/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright Authors of Cilium
# SPDX-License-Identifier: Apache-2.0

ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:bf0a07887573b8362c8bf0e71f161da20c6d87f1@sha256:b82cdd3174e42771c97dc06658b3c0cdac89f81f834db06dafa4e96527f4039a
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:9f4a2d2a7c7e719011bdc5ad519852313252ff82@sha256:8cddd001b75acaa624cdcef3dd37d9dba1a3117b80de46f238fdb969c6746fb9
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88


# cilium-envoy from github.com/cilium/proxy
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-gke.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-kernel.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a"; fi'
script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88"; fi'
)}"""
}

Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/kubernetes-upstream.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:80dfd41c0ec38d88a1cc930e320dd63915596968@sha256:e884c20fca06682562e98a9efdd90109e6cb2d2433c49124ac0ab10f67c6c94a"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:8f505ba8c03df3a22cde6b86775f8e0be6d2ade4@sha256:19e9354faf20a1c4eef4c5319b780f965847b025bee70bcb0054def976f79e88"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/k8s/manifests/demo-customcalls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ metadata:
spec:
containers:
- name: cilium-builder
image: quay.io/cilium/cilium-builder:bf0a07887573b8362c8bf0e71f161da20c6d87f1@sha256:b82cdd3174e42771c97dc06658b3c0cdac89f81f834db06dafa4e96527f4039a
image: quay.io/cilium/cilium-builder:9f4a2d2a7c7e719011bdc5ad519852313252ff82@sha256:8cddd001b75acaa624cdcef3dd37d9dba1a3117b80de46f238fdb969c6746fb9
workingDir: /cilium
command: ["sleep"]
args:
Expand Down

0 comments on commit a58e3f4

Please sign in to comment.