Skip to content

Commit

Permalink
Revert "image: Take explicit dependency on util-linux for uuidgen and…
Browse files Browse the repository at this point in the history
… gzip"

This reverts commit 71d199c, openshift#1262

Since openshift/release@00d7b3f31 (ci-operator/templates/openshift:
Use IMAGE_TESTS for teardown gzip, 2019-02-19,
openshift/release#2911), the release repository no longer users the
installer image for the teardown containers.
  • Loading branch information
wking committed Mar 4, 2019
1 parent a98d4d7 commit f716b8f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions images/installer/Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ 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 yum install -y util-linux gzip && yum clean all && rm -rf /var/cache/yum/* && \
mkdir /output && chown 1000:1000 /output
RUN mkdir /output && chown 1000:1000 /output
USER 1000:1000
ENV PATH /bin
ENV HOME /output
Expand Down
3 changes: 1 addition & 2 deletions images/installer/Dockerfile.ci.rhel7
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ 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 yum install -y util-linux gzip && yum clean all && rm -rf /var/cache/yum/* && \
mkdir /output && chown 1000:1000 /output
RUN mkdir /output && chown 1000:1000 /output
USER 1000:1000
ENV PATH /bin
ENV HOME /output
Expand Down

0 comments on commit f716b8f

Please sign in to comment.