Skip to content

Commit 0cbe57c

Browse files
UPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd
Signed-off-by: Rashmi Gottipati <[email protected]>
1 parent 3a7ed1f commit 0cbe57c

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

openshift/catalogd.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
2+
3+
ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
24
WORKDIR /build
35
COPY . .
46
RUN make go-build-local

openshift/operator-controller.Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
2+
3+
ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
24
WORKDIR /build
35
COPY . .
46
RUN make go-build-local && \

openshift/registry.Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
2+
3+
ARG SOURCE_GIT_COMMIT
4+
ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
25
WORKDIR /build
36
COPY . .
47
# TODO Modify upstream Makefile to separate the 'go build' commands

0 commit comments

Comments
 (0)