Merge pull request #176 from openshift/make-docker-consistent

NO-JIRA: chore: make dockerfile consistent with konflux, add make podman-cross-build command

Author: openshift-merge-bot[bot]

Dockerfile.dev

@@ -1,13 +1,13 @@
-# This Dockerfile is used for local testing of images. All images should be available for public use
-FROM registry.access.redhat.com/ubi9/nodejs-22:latest AS web-builder
+FROM registry.redhat.io/ubi9/nodejs-22:latest AS web-builder
 
 WORKDIR /opt/app-root
 
 USER 0
 
+ENV HUSKY=0
 COPY web/package*.json web/
 COPY Makefile Makefile
-RUN make install-frontend
+RUN make install-frontend-ci
 
 COPY web/ web/
 RUN make build-frontend
@@ -20,14 +20,23 @@ COPY Makefile Makefile
 COPY go.mod go.mod
 COPY go.sum go.sum
 
-RUN go mod download
+RUN make install-backend
 
 COPY cmd/ cmd/
 COPY pkg/ pkg/
 
-RUN make build-backend
+ENV GOFLAGS='-mod=mod'
+ENV GOEXPERIMENT=strictfipsruntime
+ENV CGO_ENABLED=1
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal
+RUN make build-backend BUILD_OPTS="-tags strictfipsruntime"
+
+FROM registry.redhat.io/rhel9-4-els/rhel:9.4
+
+RUN mkdir /licenses
+COPY LICENSE /licenses/.
+
+USER 1001
 
 COPY --from=web-builder /opt/app-root/web/dist /opt/app-root/web/dist
 COPY --from=go-builder /opt/app-root/plugin-backend /opt/app-root

Makefile

@@ -1,3 +1,9 @@
+
+VERSION     ?= latest
+PLATFORMS   ?= linux/arm64,linux/amd64
+ORG         ?= openshift-observability-ui
+IMAGE       ?= quay.io/${ORG}/troubleshooting-panel-console-plugin:${VERSION}
+
 .PHONY: test
 test: test-frontend
 
@@ -56,15 +62,11 @@ build-image: build-frontend test-frontend
 start-forward:
 	./scripts/start-forward.sh
 
-export REGISTRY_ORG?=	openshift-observability-ui
-export TAG?=latest
-IMAGE=quay.io/${REGISTRY_ORG}/troubleshooting-panel-console-plugin:${TAG}
-
 .PHONY: deploy
 deploy:	test-frontend		## Build and push image, reinstall on cluster using helm.
 	helm uninstall troubleshooting-panel-console-plugin -n troubleshooting-panel-console-plugin || true
 	PUSH=1 scripts/build-image.sh
-	helm install troubleshooting-panel-console-plugin charts/openshift-console-plugin -n troubleshooting-panel-console-plugin --create-namespace --set plugin.image=$(IMAGE)
+	helm install troubleshooting-panel-console-plugin charts/openshift-console-plugin -n troubleshooting-panel-console-plugin --create-namespace --set plugin.image=${IMAGE}
 
 .PHONY: start-devspace-backend
 start-devspace-backend:
@@ -77,3 +79,9 @@ gen-client: web/src/korrel8r/client
 web/src/korrel8r/client: korrel8r/swagger.json
 	cd web && npx openapi-typescript-codegen --indent 2 --input ../$< --output ../$@ --name Korrel8rClient
 	@touch $@
+
+.PHONY: podman-cross-build
+podman-cross-build:
+	podman manifest create -a ${IMAGE}
+	podman build --platform=${PLATFORMS} --manifest ${IMAGE} -f Dockerfile.dev
+	podman manifest push ${IMAGE}