Merge pull request #619 from jgbernalp/make-docker-consistent

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

Author: openshift-merge-bot[bot]

Dockerfile.mcp

@@ -1,46 +1,51 @@
-# mcp (monitoring-console-plugin)
+FROM registry.redhat.io/ubi9/nodejs-22:latest AS web-builder
 
-FROM registry.redhat.io/ubi9/nodejs-22:9.6-1755075210 AS web-builder
+WORKDIR /opt/app-root
 
 USER 0
 
-WORKDIR /opt/app-root
-
 ENV HUSKY=0
-
+COPY web/package*.json web/
 COPY Makefile Makefile
-COPY scripts/update-plugin-name.sh scripts/update-plugin-name.sh
-COPY web/ web/
+RUN cd web && npm ci --legacy-peer-deps --omit=optional --ignore-scripts
 
+COPY web/ web/
+COPY config/ config/
+COPY scripts/update-plugin-name.sh scripts/update-plugin-name.sh
 RUN make update-plugin-name
-
 ENV I18N_NAMESPACE="plugin__monitoring-console-plugin"
-
-RUN make install-frontend
 RUN make build-frontend
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as go-builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24 as go-builder
 
 WORKDIR /opt/app-root
 
 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 go build -mod=mod -o plugin-backend cmd/plugin-backend.go
+ENV GOOS=${TARGETOS:-linux}
+ENV GOARCH=${TARGETARCH}
+ENV GOEXPERIMENT=strictfipsruntime
+ENV GOFLAGS=-mod=readonly
+ENV CGO_ENABLED=1
+
+RUN make build-backend
+
+FROM registry.redhat.io/rhel9-4-els/rhel:9.4
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal
+RUN mkdir /licenses
+COPY LICENSE /licenses/.
 
 USER 1001
 
 COPY --from=web-builder /opt/app-root/web/dist /opt/app-root/web/dist
-COPY --from=web-builder /opt/app-root/web/package.json /opt/app-root/web/package.json
 COPY --from=go-builder /opt/app-root/plugin-backend /opt/app-root
-COPY config/ /opt/app-root/config
+COPY --from=web-builder /opt/app-root/config /opt/app-root/config
 
-ENTRYPOINT ["/opt/app-root/plugin-backend", "-static-path", "/opt/app-root/web/dist", "-config-path", "/opt/app-root/config"]
+ENTRYPOINT ["/opt/app-root/plugin-backend", "-static-path", "/opt/app-root/web/dist"]

Makefile

@@ -1,3 +1,10 @@
+VERSION     ?= latest
+PLATFORMS   ?= linux/arm64,linux/amd64
+ORG         ?= openshift-observability-ui
+PLUGIN_NAME ?=monitoring-plugin
+IMAGE       ?= quay.io/${ORG}/${PLUGIN_NAME}:${VERSION}
+FEATURES    ?=incidents,perses-dashboards,dev-config
+
 .PHONY: install-frontend
 install-frontend:
 	cd web && npm install
@@ -65,11 +72,6 @@ install:
 update-plugin-name:
 	./scripts/update-plugin-name.sh
 
-export REGISTRY_ORG?=openshift-observability-ui
-export TAG?=latest
-export PLUGIN_NAME?=monitoring-plugin
-IMAGE=quay.io/${REGISTRY_ORG}/monitoring-plugin:${TAG}
-
 .PHONY: deploy
 deploy:
 	make lint-backend
@@ -83,7 +85,7 @@ deploy-acm:
 
 .PHONY: build-mcp-image
 build-mcp-image:
-	DOCKER_FILE_NAME="Dockerfile.mcp" REPO="monitoring-console-plugin" scripts/build-image.sh 
+	DOCKER_FILE_NAME="Dockerfile.mcp" REPO="monitoring-console-plugin" scripts/build-image.sh
 
 .PHONY: build-dev-mcp-image
 build-dev-mcp-image:
@@ -93,16 +95,14 @@ build-dev-mcp-image:
 start-feature-console:
 	PLUGIN_PORT=9443 ./scripts/start-console.sh
 
-export FEATURES?=incidents,perses-dashboards,dev-config
 .PHONY: start-feature-backend
 start-feature-backend:
-	go run ./cmd/plugin-backend.go -port='9443' -config-path='./config' -static-path='./web/dist' -features='$(FEATURES)'
+	go run ./cmd/plugin-backend.go -port='9443' -config-path='./config' -static-path='./web/dist' -features='${FEATURES}'
 
-export PLATFORMS ?= linux/arm64,linux/amd64
-.PHONY: mcp-podman-cross-build
-mcp-podman-cross-build:
+.PHONY: podman-cross-build
+podman-cross-build:
 	podman manifest create ${IMAGE}
-	podman build --platform $(PLATFORMS) --manifest ${IMAGE} -f Dockerfile.mcp
+	podman build --platform ${PLATFORMS} --manifest ${IMAGE} -f Dockerfile.mcp
 	podman manifest push ${IMAGE}
 
 .PHONY: test-translations