Merge pull request #1262 from smarterclayton/depend_util_linux

image: Take explicit dependency on util-linux for uuidgen and gzip
openshift · Feb 16, 2019 · 03c258b · 03c258b
2 parents 5af1819 + 71d199c
commit 03c258b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/images/installer/Dockerfile.ci b/images/installer/Dockerfile.ci
@@ -9,7 +9,8 @@ RUN hack/build.sh
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
-RUN mkdir /output && chown 1000:1000 /output
+RUN yum install -y util-linux gzip && yum clean all && rm -rf /var/cache/yum/* && \
+    mkdir /output && chown 1000:1000 /output
 USER 1000:1000
 ENV PATH /bin
 ENV HOME /output

diff --git a/images/installer/Dockerfile.ci.rhel7 b/images/installer/Dockerfile.ci.rhel7
@@ -9,7 +9,8 @@ RUN hack/build.sh
 
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
 COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
-RUN mkdir /output && chown 1000:1000 /output
+RUN yum install -y util-linux gzip && yum clean all && rm -rf /var/cache/yum/* && \
+    mkdir /output && chown 1000:1000 /output
 USER 1000:1000
 ENV PATH /bin
 ENV HOME /output