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 committed Dec 6, 2022
1 parent 7fbd2e5 commit 909abc7
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 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 @@ -164,7 +164,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:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down Expand Up @@ -239,7 +239,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:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5
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:1b8f97cf70e2a4e7b0609f259d9540523c50cc9f@sha256:0b18c799b88ec039cb0d6d6338ddf539f530319960f9dbc22b69ec6167d3c2ec
CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:f4da8a7ffb1e124ded9004fdaf58a42edc16387a@sha256:f632501ef268f4ba81c208effd434e0b9b694ca323e06e378dce9856065fba14

.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:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5
ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
ARG GOLANG_IMAGE=docker.io/library/golang:1.19.3@sha256:c7463cad771c6774d044f4c38b9b1772c92c582e96f3ed336e85d53ed83b291a
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:3408daa17f6490a464dfc746961e28ae31964c66@sha256:ff13a1a9f973d102c6ac907d2bc38a524c8e1d26c6c1b16ed809a98925206a79
Expand Down
2 changes: 1 addition & 1 deletion images/cilium-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright Authors of Cilium
# SPDX-License-Identifier: Apache-2.0

ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:1b8f97cf70e2a4e7b0609f259d9540523c50cc9f@sha256:0b18c799b88ec039cb0d6d6338ddf539f530319960f9dbc22b69ec6167d3c2ec
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:f4da8a7ffb1e124ded9004fdaf58a42edc16387a@sha256:f632501ef268f4ba81c208effd434e0b9b694ca323e06e378dce9856065fba14
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:22.04@sha256:4b1d0c4a2d2aaf63b37111f34eb9fa89fa1bf53dd6e4ca954d47caebca4005c2

FROM ${UBUNTU_IMAGE} as rootfs
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:1b8f97cf70e2a4e7b0609f259d9540523c50cc9f@sha256:0b18c799b88ec039cb0d6d6338ddf539f530319960f9dbc22b69ec6167d3c2ec
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:f4da8a7ffb1e124ded9004fdaf58a42edc16387a@sha256:f632501ef268f4ba81c208effd434e0b9b694ca323e06e378dce9856065fba14
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5

# 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:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5"
}
}
}
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:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5"
}
}
}
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:1a8102930aa1ec5d82312abc941edb4097db000a@sha256:a17d29f9d79dc984314c4f3420d5455a465b8201afb1eef3db7063d8de982b19"; fi'
script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5"; 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 @@ -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:e9c9062da04ac8981a48dcb63a025febf6dffdc4@sha256:588bc29f81cad9b29dc8539a39906583de8723f86c88417a5de5c017ac1087a5"
}
}
}
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:1b8f97cf70e2a4e7b0609f259d9540523c50cc9f@sha256:0b18c799b88ec039cb0d6d6338ddf539f530319960f9dbc22b69ec6167d3c2ec
image: quay.io/cilium/cilium-builder:f4da8a7ffb1e124ded9004fdaf58a42edc16387a@sha256:f632501ef268f4ba81c208effd434e0b9b694ca323e06e378dce9856065fba14
workingDir: /cilium
command: ["sleep"]
args:
Expand Down

0 comments on commit 909abc7

Please sign in to comment.