Merge pull request openshift#241 from Prashanth684/okd

OKD-218: install util-linux
dougbtv · Jun 7, 2024 · 2b4b4f1 · 2b4b4f1
2 parents 90e2ce3 + 2089a3f
commit 2b4b4f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile.microshift b/Dockerfile.microshift
@@ -9,7 +9,8 @@ RUN ./hack/build-go.sh
 WORKDIR /
 
 FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
-RUN mkdir -p /usr/src/multus-cni/bin
+RUN dnf install -y util-linux && dnf clean all && \
+    mkdir -p /usr/src/multus-cni/bin
 COPY --from=rhel9 \
   /usr/src/multus-cni/bin/thin_entrypoint \
   /usr/src/multus-cni/bin/multus \

diff --git a/Dockerfile.openshift b/Dockerfile.openshift
@@ -20,7 +20,8 @@ RUN ./hack/build-go.sh && \
 WORKDIR /
 
 FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
-RUN mkdir -p /usr/src/multus-cni/images && \
+RUN dnf install -y util-linux && dnf clean all && \
+       mkdir -p /usr/src/multus-cni/images && \
        mkdir -p /usr/src/multus-cni/bin && \
        mkdir -p /usr/src/multus-cni/rhel9/bin && \
        mkdir -p /usr/src/multus-cni/rhel8/bin