add label

Author: edcdavid

ptp-tools/Dockerfile.cep

@@ -7,16 +7,28 @@ ENV GOPATH=/go
 ENV GOMAXPROCS=16
 
 WORKDIR /go/src/github.com/redhat-cne/cloud-event-proxy
-RUN git clone -b main https://github.com/redhat-cne/cloud-event-proxy.git /go/src/github.com/redhat-cne/cloud-event-proxy
+RUN git clone -b main https://github.com/redhat-cne/cloud-event-proxy.git /go/src/github.com/redhat-cne/cloud-event-proxy && \
+    cd /go/src/github.com/redhat-cne/cloud-event-proxy && \
+    git rev-parse HEAD > /tmp/COMMIT_HASH
 
 RUN hack/build-go.sh
 
 FROM quay.io/centos/centos:stream9
+
+ARG COMMIT_HASH
+
 COPY --from=builder /go/src/github.com/redhat-cne/cloud-event-proxy/build/cloud-event-proxy /
 COPY --from=builder /go/src/github.com/redhat-cne/cloud-event-proxy/plugins/*.so /plugins/
+COPY --from=builder /tmp/COMMIT_HASH /tmp/COMMIT_HASH
+
+# If COMMIT_HASH not provided as build-arg, read it from the file
+RUN if [ -z "$COMMIT_HASH" ]; then COMMIT_HASH=$(cat /tmp/COMMIT_HASH); fi && \
+    echo "Commit: $COMMIT_HASH"
+
 LABEL io.k8s.display-name="Cloud Event Proxy" \
       io.k8s.description="This is a component of OpenShift Container Platform and provides a side car to handle cloud events." \
       io.openshift.tags="openshift" \
+      io.openshift.build.commit.url="https://github.com/redhat-cne/cloud-event-proxy/commit/${COMMIT_HASH:-unknown}" \
       maintainer="PTP Team <ptp-dev@redhat.com>"
 
 ENTRYPOINT ["./cloud-event-proxy"]

ptp-tools/Dockerfile.krp

@@ -1,6 +1,8 @@
 FROM docker.io/golang:1.24.3 AS builder
 WORKDIR /go/src/github.com/brancz/kube-rbac-proxy
-RUN git clone https://github.com/openshift/kube-rbac-proxy.git /go/src/github.com/brancz/kube-rbac-proxy
+RUN git clone https://github.com/openshift/kube-rbac-proxy.git /go/src/github.com/brancz/kube-rbac-proxy && \
+    cd /go/src/github.com/brancz/kube-rbac-proxy && \
+    git rev-parse HEAD > /tmp/COMMIT_HASH
 ENV GO111MODULE=on
 ENV GOMAXPROCS=16
 
@@ -10,15 +12,24 @@ RUN GITHUB_URL=github.com/openshift/kube-rbac-proxy VERSION=$(cat VERSION) make
     cp _output/kube-rbac-proxy-$(go env GOOS)-$(go env GOARCH) _output/kube-rbac-proxy
 
 FROM quay.io/centos/centos:stream9
+
+ARG COMMIT_HASH
+ARG FROM_DIRECTORY=/go/src/github.com/brancz/kube-rbac-proxy
+
+COPY --from=builder ${FROM_DIRECTORY}/_output/kube-rbac-proxy  /usr/bin/kube-rbac-proxy
+COPY --from=builder /tmp/COMMIT_HASH /tmp/COMMIT_HASH
+
+# If COMMIT_HASH not provided as build-arg, read it from the file
+RUN if [ -z "$COMMIT_HASH" ]; then COMMIT_HASH=$(cat /tmp/COMMIT_HASH); fi && \
+    echo "Commit: $COMMIT_HASH"
+
 LABEL io.k8s.display-name="kube-rbac-proxy" \
       io.k8s.description="This is a proxy, that can perform Kubernetes RBAC authorization." \
       io.openshift.tags="openshift,kubernetes" \
+      io.openshift.build.commit.url="https://github.com/openshift/kube-rbac-proxy/commit/${COMMIT_HASH:-unknown}" \
       summary="" \
       maintainer="OpenShift Monitoring Team <team-monitoring@redhat.com>"
 
-ARG FROM_DIRECTORY=/go/src/github.com/brancz/kube-rbac-proxy
-COPY --from=builder ${FROM_DIRECTORY}/_output/kube-rbac-proxy  /usr/bin/kube-rbac-proxy
-
 USER 65534
 EXPOSE 8080
 ENTRYPOINT ["/usr/bin/kube-rbac-proxy"]

ptp-tools/Dockerfile.lptpd

@@ -2,19 +2,29 @@ FROM docker.io/golang:1.24.3 AS builder
 WORKDIR /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon
 ENV GOMAXPROCS=16
 
-RUN git clone -b main https://github.com/k8snetworkplumbingwg/linuxptp-daemon.git  /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon
+RUN git clone -b main https://github.com/k8snetworkplumbingwg/linuxptp-daemon.git  /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon && \
+    cd /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon && \
+    git rev-parse HEAD > /tmp/COMMIT_HASH
 
 RUN make clean && make -j 16
 
 FROM quay.io/centos/centos:stream9
+
+ARG COMMIT_HASH
 RUN yum install -y gpsd-minimal glibc gpsd-minimal-clients linuxptp ethtool hwdata synce4l  && yum clean all
 
 # Create symlinks for executables to match references
 RUN ln -s /usr/bin/gpspipe /usr/local/bin/gpspipe
 RUN ln -s /usr/sbin/gpsd /usr/local/sbin/gpsd
 RUN ln -s /usr/bin/ubxtool /usr/local/bin/ubxtool
 
-
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/linuxptp-daemon/bin/ptp /usr/local/bin/
+COPY --from=builder /tmp/COMMIT_HASH /tmp/COMMIT_HASH
+
+# If COMMIT_HASH not provided as build-arg, read it from the file
+RUN if [ -z "$COMMIT_HASH" ]; then COMMIT_HASH=$(cat /tmp/COMMIT_HASH); fi && \
+    echo "Commit: $COMMIT_HASH"
+
+LABEL io.openshift.build.commit.url="https://github.com/k8snetworkplumbingwg/linuxptp-daemon/commit/${COMMIT_HASH:-unknown}"
 
 CMD ["/usr/local/bin/ptp"]

ptp-tools/Dockerfile.ptpop

@@ -4,16 +4,28 @@ COPY .. .
 ENV GO111MODULE=off
 ENV GOMAXPROCS=16
 
+# Capture the commit hash from the copied repository
+RUN if [ -d .git ]; then git rev-parse HEAD > /tmp/COMMIT_HASH; else echo "unknown" > /tmp/COMMIT_HASH; fi
+
 RUN make -j 16
 
 FROM quay.io/centos/centos:stream9
+
+ARG COMMIT_HASH
+
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/ptp-operator/build/_output/bin/ptp-operator /usr/local/bin/
 COPY --from=builder /go/src/github.com/k8snetworkplumbingwg/ptp-operator/manifests /manifests
+COPY --from=builder /tmp/COMMIT_HASH /tmp/COMMIT_HASH
 COPY bindata /bindata
 
+# If COMMIT_HASH not provided as build-arg, read it from the file
+RUN if [ -z "$COMMIT_HASH" ]; then COMMIT_HASH=$(cat /tmp/COMMIT_HASH); fi && \
+    echo "Commit: $COMMIT_HASH"
+
 LABEL io.k8s.display-name="OpenShift ptp-operator" \
       io.k8s.description="This is a component that manages cluster PTP configuration." \
       io.openshift.tags="openshift,ptp" \
+      io.openshift.build.commit.url="https://github.com/k8snetworkplumbingwg/ptp-operator/commit/${COMMIT_HASH:-unknown}" \
       com.redhat.delivery.appregistry=true \
       maintainer="PTP Dev Team <ptp-dev@redhat.com>"
 

ptp-tools/Makefile

@@ -40,7 +40,9 @@ podman-push-%:
 
 build-image:
 	podman manifest create ${IMG_PREFIX}:$(VAR)
-	podman build --no-cache --platform $(PLATFORM) -f Dockerfile.$(VAR)  --manifest ${IMG_PREFIX}:$(VAR)  ..
+	# Optionally pass COMMIT_HASH as build argument if set
+	$(eval BUILD_ARGS := $(if $(COMMIT_HASH),--build-arg COMMIT_HASH=$(COMMIT_HASH),))
+	podman build --no-cache --platform $(PLATFORM) $(BUILD_ARGS) -f Dockerfile.$(VAR)  --manifest ${IMG_PREFIX}:$(VAR)  ..
 
 clean-image:
 	podman image rm ${IMG_PREFIX}:$(VAR) || true

ptp-tools/README.md

@@ -1,4 +1,23 @@
-# PTP Tools - Container Image Builder
+# PTP Tools
+
+## Build Commit Labels
+
+All CI images built from these Dockerfiles include an `io.openshift.build.commit.url` label that points to the exact commit of the source code compiled into the image:
+
+- **Dockerfile.lptpd**: Points to the linuxptp-daemon commit from github.com/k8snetworkplumbingwg/linuxptp-daemon
+- **Dockerfile.cep**: Points to the cloud-event-proxy commit from github.com/redhat-cne/cloud-event-proxy  
+- **Dockerfile.krp**: Points to the kube-rbac-proxy commit from github.com/openshift/kube-rbac-proxy
+- **Dockerfile.ptpop**: Points to the ptp-operator commit from github.com/k8snetworkplumbingwg/ptp-operator
+
+The commit hash is automatically captured during the build process from the cloned/copied repository.
+
+### Overriding Commit Hash
+
+You can optionally override the commit hash by passing it as a build argument:
+
+```bash
+make build-image VAR=lptpd COMMIT_HASH=abc123def456
+``` - Container Image Builder
 
 This directory contains tools and scripts for building all container images required to run the PTP operator.