Fix 'Build and push images' action

Signed-off-by: Arik Hadas <ahadas@redhat.com>
kubev2v · Jul 13, 2023 · 25457a4 · 25457a4
1 parent 3f6e6cf
commit 25457a4
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -49,6 +49,15 @@ load(
     "container_push",
 )
 
+container_push(
+    name = "push-ova-provider-server",
+    format = "Docker",
+    image = "//cmd/ova-provider-server:ova-provider-server-image",
+    registry = "$${REGISTRY:-quay.io}",
+    repository = "$${REGISTRY_ACCOUNT:-}$${REGISTRY_ACCOUNT:+/}forklift-ova-provider-server",
+    tag = "$${REGISTRY_TAG:-devel}",
+)
+
 container_push(
     name = "push-forklift-controller",
     format = "Docker",

diff --git a/WORKSPACE b/WORKSPACE
@@ -36,6 +36,13 @@ http_file(
     ],
 )
 
+load("@io_bazel_rules_docker//contrib:dockerfile_build.bzl", "dockerfile_image")
+
+dockerfile_image(
+    name = "ova-provider-server-image-dockerfile",
+    dockerfile = "//:ova_provider_server_containerfile",
+)
+
 load(
     "@io_bazel_rules_docker//toolchains/docker:toolchain.bzl",
     docker_toolchain_configure = "toolchain_configure",

diff --git a/cmd/ova-provider-server/BUILD.bazel b/cmd/ova-provider-server/BUILD.bazel
@@ -12,3 +12,14 @@ go_binary(
     embed = [":ova-provider-server_lib"],
     visibility = ["//visibility:public"],
 )
+
+load(
+    "@io_bazel_rules_docker//container:container.bzl",
+    "container_image",
+)
+
+container_image(
+    name = "ova-provider-server-image",
+    base = "@ova-provider-server-image-dockerfile//image:dockerfile_image.tar",
+    visibility = ["//visibility:public"],
+)
diff --git a/hack/ova-provider-server/BUILD.bazel b/hack/ova-provider-server/BUILD.bazel
diff --git a/hack/release-images.sh b/hack/release-images.sh
@@ -26,7 +26,7 @@ bazel run --package_path=virt-v2v/warm push-forklift-virt-v2v-warm
 bazel run push-populator-controller
 bazel run push-forklift-controller
 bazel run push-forklift-validation
-bazel run push-ova-provider-server-image
+bazel run push-ova-provider-server
 bazel run push-forklift-operator
 bazel run push-forklift-operator-bundle \
     --action_env OPERATOR_IMAGE=${OPERATOR_IMAGE} \

diff --git a/ova_provider_server_containerfile b/ova_provider_server_containerfile
@@ -0,0 +1 @@
+hack/ova-provider-server/Containerfile