Merge pull request #1 from ankitathomas/fix-commit-ID

add openshift specific build target to pass commit info downstream

Author: rashmigottipati

openshift/Makefile

@@ -37,3 +37,8 @@ test-e2e: ## Run the e2e tests.
 	$(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
 	cd $(DIR)/../; \
 	go test $(DOWNSTREAM_E2E_FLAGS) ./test/e2e/...;
+
+export GIT_COMMIT := ${SOURCE_GIT_COMMIT}
+PHONY: go-build-local
+go-build-local:
+	$(MAKE) -n -f Makefile go-build-local

openshift/catalogd.Dockerfile

@@ -1,10 +1,8 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
 
-ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
-
 WORKDIR /build
 COPY . .
-RUN make go-build-local
+RUN make -f openshift/Makefile go-build-local
 
 FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
 USER 1001

openshift/operator-controller.Dockerfile

@@ -1,10 +1,8 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
 
-ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
-
 WORKDIR /build
 COPY . .
-RUN make go-build-local
+RUN make -f openshift/Makefile go-build-local
 
 FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
 USER 1001

openshift/registry.Dockerfile

@@ -1,8 +1,5 @@
 FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
 
-ARG SOURCE_GIT_COMMIT
-ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
-
 WORKDIR /build
 COPY . .
 # TODO Modify upstream Makefile to separate the 'go build' commands