Merge pull request #421 from anchi205/add-mount-1.4

Cherry-pick: Add mount binary to base image

Author: avinal

.konflux/shared-resource-webhook/Dockerfile

@@ -1,18 +1,18 @@
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder
+FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
 COPY . .
 
 RUN rm -f /vendor/k8s.io/apimachinery/pkg/util/managedfields/pod.yaml
 
-RUN CGO_ENABLED=1 GO111MODULE=on go build -a -mod=vendor -buildvcs=false -ldflags="-s -w" -tags="strictfipsruntime" -o openshift-builds-shared-resource-webhook ./cmd/webhook
+RUN CGO_ENABLED=1 GO111MODULE=on go build -a -mod=vendor -buildvcs=false -ldflags="-s -w" -tags="strictfipsruntime" -o /tmp/openshift-builds-shared-resource-webhook ./cmd/webhook
 
 FROM registry.access.redhat.com/ubi9-minimal:9.6
 
 WORKDIR /
 
-COPY --from=builder /openshift-builds-shared-resource-webhook .
+COPY --from=builder /tmp/openshift-builds-shared-resource-webhook .
 COPY LICENSE /licenses/
 
 ENTRYPOINT ["./openshift-builds-shared-resource-webhook"]

.konflux/shared-resource/Dockerfile

@@ -1,18 +1,23 @@
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder
+FROM registry.redhat.io/ubi9/go-toolset:1.24 AS builder
 
 ENV GOEXPERIMENT=strictfipsruntime
 
 COPY . .
 
 RUN rm -f /vendor/k8s.io/apimachinery/pkg/util/managedfields/pod.yaml
 
-RUN CGO_ENABLED=1 GO111MODULE=on go build -a -mod=vendor -buildvcs=false -ldflags="-s -w" -tags="strictfipsruntime" -o openshift-builds-shared-resource ./cmd/csidriver
+RUN CGO_ENABLED=1 GO111MODULE=on go build -a -mod=vendor -buildvcs=false -ldflags="-s -w" -tags="strictfipsruntime" -o /tmp/openshift-builds-shared-resource ./cmd/csidriver
 
 FROM registry.access.redhat.com/ubi9-minimal:9.6
 
+RUN \
+  microdnf --assumeyes --nodocs install util-linux && \
+  microdnf clean all && \
+  rm -rf /var/cache/yum
+
 WORKDIR /
 
-COPY --from=builder /openshift-builds-shared-resource .
+COPY --from=builder /tmp/openshift-builds-shared-resource .
 COPY LICENSE /licenses/
 
 ENTRYPOINT ["./openshift-builds-shared-resource"]

.tekton/openshift-builds-shared-resource-pull-request.yaml

@@ -36,12 +36,14 @@ spec:
     value: "true"
   - name: hermetic
     value: "true"
+  - name: prefetch-dev-package-managers
+    value: "true"
   - name: build-platforms
     value:
       - linux/x86_64
       - linux/arm64
   - name: prefetch-input
-    value: '{"packages": [{"type": "gomod"}]}'
+    value: '{"packages": [{"type": "gomod"},{"type": "rpm"}]}'
   pipelineRef:
     resolver: git
     params:

.tekton/openshift-builds-shared-resource-push.yaml

@@ -34,14 +34,16 @@ spec:
     value: "true"
   - name: hermetic
     value: "true"
+  - name: prefetch-dev-package-managers
+    value: "true"
   - name: build-platforms
     value:
       - linux/x86_64
       - linux/arm64
       - linux/ppc64le
       - linux/s390x
   - name: prefetch-input
-    value: '{"packages": [{"type": "gomod"}]}'
+    value: '{"packages": [{"type": "gomod"},{"type": "rpm"}]}'
   pipelineRef:
     resolver: git
     params:

rpms.in.yaml

@@ -0,0 +1,5 @@
+contentOrigin:
+  repofiles:
+    - ./ubi.repo
+packages: [util-linux]
+arches: [x86_64, aarch64, s390x, ppc64le]