dockerfile: build ux-backend-server and devicefinder image

Signed-off-by: Rohan Gupta <[email protected]>

Author: rohan47

Dockerfile

@@ -18,6 +18,7 @@ COPY config/ config/
 COPY metrics/ metrics/
 COPY console/ console/
 COPY hack/ hack/
+COPY services/ services/
 COPY main.go Makefile ./
 
 # Build
@@ -28,6 +29,7 @@ RUN make go-build
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /
 COPY --from=builder /workspace/bin/manager .
+COPY --from=builder /workspace/bin/ux-backend-server .
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -108,6 +108,12 @@ docker-build: godeps-update test-setup go-test ## Build docker image with the ma
 docker-push: ## Push docker image with the manager.
 	docker push ${IMG}
 
+devicefinder-build: ## Build devicefinder binary.
+	./hack/build-devicefinder.sh
+
+devicefinder-push: ## Push devicefinder image.
+	docker-push ${DEVICEFINDER_IMAGE}
+
 ##@ Deployment
 
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.

hack/build-devicefinder.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+set -x
+
+pushd services/devicefinder
+podman build -f Dockerfile -t "${DEVICEFINDER_IMAGE}" ../.. \
+    --build-arg="LDFLAGS=${LDFLAGS}" --platform="linux/amd64"
+popd

hack/go-build.sh

@@ -8,3 +8,4 @@ export GO111MODULE=${GO111MODULE:-on}
 set -x
 
 go build -a -o ${GOBIN:-bin}/manager main.go
+go build -a -o ${GOBIN:-bin}/ux-backend-server services/ux-backend/main.go

hack/make-bundle-vars.mk

@@ -45,6 +45,7 @@ IMAGE_REGISTRY ?= quay.io
 REGISTRY_NAMESPACE ?= ocs-dev
 IMAGE_TAG ?= latest
 IMAGE_NAME ?= odf-operator
+DEVICEFINDER_IMAGE_NAME ?= odf-devicefinder
 BUNDLE_IMAGE_NAME ?= $(IMAGE_NAME)-bundle
 ODF_DEPS_BUNDLE_NAME ?= odf-dependencies
 ODF_DEPS_BUNDLE_IMAGE_NAME ?= $(ODF_DEPS_BUNDLE_NAME)-bundle
@@ -56,6 +57,9 @@ ODF_DEPS_CATALOG_IMAGE_NAME ?= $(ODF_DEPS_BUNDLE_NAME)-catalog
 # IMG defines the image used for the operator.
 IMG ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(IMAGE_NAME):$(IMAGE_TAG)
 
+# DEVICEFINDER_IMAGE defines the image used for the devicefinder.
+DEVICEFINDER_IMAGE ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(DEVICEFINDER_IMAGE_NAME):$(IMAGE_TAG)
+
 # BUNDLE_IMG defines the image used for the bundle.
 BUNDLE_IMG ?= $(IMAGE_REGISTRY)/$(REGISTRY_NAMESPACE)/$(BUNDLE_IMAGE_NAME):$(IMAGE_TAG)
 
@@ -83,9 +87,8 @@ endif
 OPERATOR_NAMESPACE ?= openshift-storage
 
 ODF_CONSOLE_IMG ?= quay.io/ocs-dev/odf-console:latest
-UX_BACKEND_SERVER_IMAGE ?= quay.io/ocs-dev/ocs-operator:latest
+UX_BACKEND_SERVER_IMAGE ?= $(IMG)
 UX_BACKEND_OAUTH_IMAGE ?= quay.io/openshift/origin-oauth-proxy:4.20.0
-DEVICEFINDER_IMAGE ?= quay.io/ocs-dev/ocs-devicefinder:latest
 
 ODF_DEPS_SUBSCRIPTION_PACKAGE ?= $(ODF_DEPS_BUNDLE_NAME)
 ODF_DEPS_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL)