Skip to content

Commit

Permalink
bazel-build-images: Move all non-core images to build-other-images ta…
Browse files Browse the repository at this point in the history
…rget

There are some non-core images that are not under the build-other-images
bundle.
Move them into the bundle for consistency.
Skip conformance-image, as it is marked as testonly and can't be included
by the build-other-images target.

Signed-off-by: Jan Schintag <[email protected]>
  • Loading branch information
jschintag committed Sep 19, 2024
1 parent 83f64c7 commit d6f76c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ container_bundle(
"$(container_prefix)/$(image_prefix)example-cloudinit-hook-sidecar:$(container_tag)": "//cmd/sidecars/cloudinit:example-cloudinit-hook-sidecar-image",
"$(container_prefix)/$(image_prefix)network-slirp-binding:$(container_tag)": "//cmd/sidecars/network-slirp-binding:network-slirp-binding-image",
"$(container_prefix)/$(image_prefix)network-passt-binding:$(container_tag)": "//cmd/sidecars/network-passt-binding:network-passt-binding-image",
"$(container_prefix)/$(image_prefix)libguestfs-tools:$(container_tag)": "//cmd/libguestfs:libguestfs-tools-image",
"$(container_prefix)/$(image_prefix)pr-helper:$(container_tag)": "//cmd/pr-helper:pr-helper",
# container-disk images
"$(container_prefix)/$(image_prefix)alpine-container-disk-demo:$(container_tag)": "//containerimages:alpine-container-disk-image",
"$(container_prefix)/$(image_prefix)cirros-container-disk-demo:$(container_tag)": "//containerimages:cirros-container-disk-image",
Expand Down
2 changes: 1 addition & 1 deletion hack/bazel-build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ bazel build \
--define image_prefix= \
--define container_tag= \
//:build-other-images //cmd/virt-operator:virt-operator-image //cmd/virt-api:virt-api-image \
//cmd/virt-controller:virt-controller-image //cmd/virt-handler:virt-handler-image //cmd/virt-launcher:virt-launcher-image //cmd/libguestfs:libguestfs-tools-image //cmd/pr-helper:pr-helper //tests:conformance_image
//cmd/virt-controller:virt-controller-image //cmd/virt-handler:virt-handler-image //cmd/virt-launcher:virt-launcher-image //tests:conformance_image

rm -rf ${DIGESTS_DIR}/${ARCHITECTURE}
mkdir -p ${DIGESTS_DIR}/${ARCHITECTURE}
Expand Down

0 comments on commit d6f76c9

Please sign in to comment.