Skip to content

Commit

Permalink
images: update cilium-{runtime,builder}
Browse files Browse the repository at this point in the history
Signed-off-by: Cilium Imagebot <noreply@cilium.io>
  • Loading branch information
Cilium Imagebot authored and aanm committed Feb 17, 2024
1 parent c48dce2 commit 1fb49c2
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Cilium",
"image": "quay.io/cilium/cilium-builder:01b026b1f332b4ec3e49bad07d1e9d649c0892c8@sha256:576121013691ccef1ccf77aeacddfaf4ef7a3501a463782426f05f24fb34ed3a",
"image": "quay.io/cilium/cilium-builder:660f4e44fb79bc0856934f8466241eb7d394d270@sha256:765d44fe9fc65d11d477d0a2177daf86a343500a00901d3d8fb2ecb95e266f06",
"workspaceFolder": "/go/src/github.com/cilium/cilium",
"workspaceMount": "source=${localWorkspaceFolder},target=/go/src/github.com/cilium/cilium,type=bind",
"features": {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-images-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,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:92994197c02e130a55132309085179268d9f9ffb@sha256:88d9eb8a937b66d583b9e7c08e0cee758411209f8364525e48b2984f1ee1afe0
BASE_IMAGE=quay.io/cilium/cilium-runtime:02cd7512e3b7ce21d4c0c2780aad60311a938b4f@sha256:44d7b7085df81a31b247aaa16702381036455d63398cfaf855e67cc9a25cf877
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down Expand Up @@ -259,7 +259,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:92994197c02e130a55132309085179268d9f9ffb@sha256:88d9eb8a937b66d583b9e7c08e0cee758411209f8364525e48b2984f1ee1afe0
BASE_IMAGE=quay.io/cilium/cilium-runtime:02cd7512e3b7ce21d4c0c2780aad60311a938b4f@sha256:44d7b7085df81a31b247aaa16702381036455d63398cfaf855e67cc9a25cf877
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:01b026b1f332b4ec3e49bad07d1e9d649c0892c8@sha256:576121013691ccef1ccf77aeacddfaf4ef7a3501a463782426f05f24fb34ed3a
CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:660f4e44fb79bc0856934f8466241eb7d394d270@sha256:765d44fe9fc65d11d477d0a2177daf86a343500a00901d3d8fb2ecb95e266f06

.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:92994197c02e130a55132309085179268d9f9ffb@sha256:88d9eb8a937b66d583b9e7c08e0cee758411209f8364525e48b2984f1ee1afe0
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:02cd7512e3b7ce21d4c0c2780aad60311a938b4f@sha256:44d7b7085df81a31b247aaa16702381036455d63398cfaf855e67cc9a25cf877
ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG GOLANG_IMAGE=docker.io/library/golang:1.21.6@sha256:7026fb72cfa9cc112e4d1bf4b35a15cac61a413d0252d06615808e7c987b33a7
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:a8c542efc076b62ba683e7699c0013adb6955f0f@sha256:38e8941107bd19eb30bdde6e478760a22325f38d1f2771dfd1b9af81d74235e7
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:01b026b1f332b4ec3e49bad07d1e9d649c0892c8@sha256:576121013691ccef1ccf77aeacddfaf4ef7a3501a463782426f05f24fb34ed3a
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:92994197c02e130a55132309085179268d9f9ffb@sha256:88d9eb8a937b66d583b9e7c08e0cee758411209f8364525e48b2984f1ee1afe0
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:660f4e44fb79bc0856934f8466241eb7d394d270@sha256:765d44fe9fc65d11d477d0a2177daf86a343500a00901d3d8fb2ecb95e266f06
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:02cd7512e3b7ce21d4c0c2780aad60311a938b4f@sha256:44d7b7085df81a31b247aaa16702381036455d63398cfaf855e67cc9a25cf877

# cilium-envoy from github.com/cilium/proxy
#
Expand Down
2 changes: 1 addition & 1 deletion images/operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.21.6@sha256:7026fb72cfa9cc112e4d1bf4b35a15cac61a413d0252d06615808e7c987b33a7
ARG ALPINE_IMAGE=docker.io/library/alpine:3.18.6@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:01b026b1f332b4ec3e49bad07d1e9d649c0892c8@sha256:576121013691ccef1ccf77aeacddfaf4ef7a3501a463782426f05f24fb34ed3a
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:660f4e44fb79bc0856934f8466241eb7d394d270@sha256:765d44fe9fc65d11d477d0a2177daf86a343500a00901d3d8fb2ecb95e266f06

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
# Represents the plataform where the build is happening, do not mix with
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:92994197c02e130a55132309085179268d9f9ffb@sha256:88d9eb8a937b66d583b9e7c08e0cee758411209f8364525e48b2984f1ee1afe0"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:02cd7512e3b7ce21d4c0c2780aad60311a938b4f@sha256:44d7b7085df81a31b247aaa16702381036455d63398cfaf855e67cc9a25cf877"
}
}
}
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:01b026b1f332b4ec3e49bad07d1e9d649c0892c8@sha256:576121013691ccef1ccf77aeacddfaf4ef7a3501a463782426f05f24fb34ed3a
image: quay.io/cilium/cilium-builder:660f4e44fb79bc0856934f8466241eb7d394d270@sha256:765d44fe9fc65d11d477d0a2177daf86a343500a00901d3d8fb2ecb95e266f06
workingDir: /cilium
command: ["/bin/sh", "-c"]
args:
Expand Down

0 comments on commit 1fb49c2

Please sign in to comment.