Skip to content

images: Drop epel-release #2207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wking wants to merge 1 commit into from
Closed

images: Drop epel-release #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions images/installer/Dockerfile.upi.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install
COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi
COPY --from=builder /go/src/github.com/openshift/installer/data/data/rhcos.json /var/lib/openshift-install/rhcos.json

## epel-release is required for jq
## gettext is required for envsubst
RUN yum install --setopt=tsflags=nodocs -y \
epel-release \
gettext \
openssh-clients && \
yum update -y && \
Expand Down
1 change: 0 additions & 1 deletion images/nested-libvirt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ COPY --from=builder /go/src/github.com/openshift/installer/images/nested-libvirt
COPY --from=builder /go/src/github.com/openshift/installer/images/nested-libvirt/mock-nss.sh /bin/mock-nss.sh

RUN yum install -y \
epel-release \
gettext \
google-cloud-sdk \
openssh-clients \
Expand Down
4 changes: 1 addition & 3 deletions images/openstack/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ COPY --from=builder /go/src/github.com/openshift/installer/images/openstack/rdo-
COPY --from=builder /go/src/github.com/openshift/installer/images/openstack/rdo-stein.gpg /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
COPY --from=registry.svc.ci.openshift.org/origin/4.1:cli /usr/bin/oc /bin/oc

RUN yum install --setopt=tsflags=nodocs -y \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&\
yum update -y && \
RUN yum update -y && \
yum install --setopt=tsflags=nodocs -y \
python-openstackclient && \
yum clean all && rm -rf /var/cache/yum/*
Expand Down