Skip to content

Commit

Permalink
openstack: use static .repo file for openstack client
Browse files Browse the repository at this point in the history
  • Loading branch information
trown committed May 8, 2019
1 parent 3bbf09a commit 60f6fe9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
5 changes: 2 additions & 3 deletions images/openstack/Dockerfile.ci
@@ -1,18 +1,17 @@
# This Dockerfile is used by CI to test using OpenShift Installer against an OpenStack cloud.
# It builds an image containing the openshift-install command as well as the openstack cli.

FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
WORKDIR /go/src/github.com/openshift/installer
COPY . .
RUN hack/build.sh

FROM registry.svc.ci.openshift.org/origin/4.1:base
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
COPY --from=builder /go/src/github.com/openshfit/installer/images/openstack/rdo-stein.repo /etc/yum.repos.d/rdo-stein.repo
COPY --from=registry.svc.ci.openshift.org/openshift/origin-v4.0: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 \
https://www.rdoproject.org/repos/rdo-release.rpm && \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&\
yum update -y && \
yum install --setopt=tsflags=nodocs -y \
python-openstackclient && \
Expand Down
7 changes: 7 additions & 0 deletions images/openstack/rdo-stein.repo
@@ -0,0 +1,7 @@
[openstack-stein]
name=OpenStack Stein Repository
baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-stein/
#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cloud-openstack-stein
gpgcheck=1
enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud

0 comments on commit 60f6fe9

Please sign in to comment.