Skip to content

Commit 403a93d

Browse files
Merge pull request #1733 from trown/fix-openstack-ci-image
openstack: use static .repo file for openstack client
2 parents f656fa7 + 1421e94 commit 403a93d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

images/openstack/Dockerfile.ci

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# This Dockerfile is used by CI to test using OpenShift Installer against an OpenStack cloud.
22
# It builds an image containing the openshift-install command as well as the openstack cli.
3-
43
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.10 AS builder
54
WORKDIR /go/src/github.com/openshift/installer
65
COPY . .
76
RUN hack/build.sh
87

98
FROM registry.svc.ci.openshift.org/origin/4.1:base
109
COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install
10+
COPY --from=builder images/openstack/rdo-stein.repo /etc/yum.repos.d/rdo-stein.repo
1111
COPY --from=registry.svc.ci.openshift.org/openshift/origin-v4.0:cli /usr/bin/oc /bin/oc
1212

1313
RUN yum install --setopt=tsflags=nodocs -y \
14-
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
15-
https://www.rdoproject.org/repos/rdo-release.rpm && \
14+
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&\
1615
yum update -y && \
1716
yum install --setopt=tsflags=nodocs -y \
1817
python-openstackclient && \

images/openstack/rdo-stein.repo

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[openstack-stein]
2+
name=OpenStack Stein Repository
3+
baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-stein/
4+
#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cloud-openstack-stein
5+
gpgcheck=0
6+
enabled=1

0 commit comments

Comments
 (0)