diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos-rdo-base/Dockerfile | 167 |
1 files changed, 84 insertions, 83 deletions
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index 4db4c7cdb..d045ba3f5 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -2,13 +2,15 @@ FROM centos MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories -RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm +RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm +RUN curl https://repos.fedorapeople.org/repos/openstack/openstack-trunk/epel-7/rc2/delorean-kilo.repo -o /etc/yum.repos.d/delorean-kilo.repo RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo # CentOS 7.1 workaround for conflicting packages with libvirt RUN rpm -e --nodeps systemd-container systemd-container-libs -RUN yum -y install systemd systemd-libs systemd-devel && yum clean all +RUN rpm -e --nodeps yum-plugin-fastestmirror +RUN yum -d 10 -y install systemd systemd-libs systemd-devel && yum clean all RUN yum install -y epel-release && yum clean all @@ -17,85 +19,85 @@ RUN yum update -y && yum clean all # Install base packages RUN yum install -y \ - crux \ - mariadb \ - mariadb-libs \ - openssl \ - openstack-utils \ - pyparsing \ - python-alembic \ - python-amqp \ - python-amqplib \ - python-anyjson \ - python-boto \ - python-cheetah \ - python-cliff \ - python-cmd2 \ - python-croniter \ - python-crypto \ - python-d2to1 \ - python-docutils \ - python-dogpile-cache \ - python-dogpile-core \ - python-empy \ - python-eventlet \ - python-flask \ - python-futures \ - python-greenlet \ - python-httplib2 \ - python-iso8601 \ - python-itsdangerous \ - python-jinja2 \ - python-jsonpatch \ - python-jsonpath-rw \ - python-jsonpointer \ - python-jsonschema \ - python-keyring \ - python-kombu \ - python-ldap \ - python-lesscpy \ - python-lockfile \ - python-lxml \ - python-markdown \ - python-memcached \ - python-migrate \ - python-msgpack \ - python-netifaces \ - python-networkx \ - python-oauthlib \ - python-oslo-config \ - python-oslo-messaging \ - python-oslo-rootwrap \ - python-paramiko \ - python-passlib \ - python-paste-deploy \ - python-pbr \ - python-pecan \ - python-ply \ - python-prettytable \ - python-psutil \ - python-pycadf \ - python-pygments \ - python-pymongo \ - python-qpid \ - python-repoze-lru \ - python-requests \ - python-routes \ - python-simplegeneric \ - python-simplejson \ - python-singledispatch \ - python-six \ - python-sqlalchemy \ - python-stevedore \ - python-taskflow \ - python-versiontools \ - python-warlock \ - python-webob \ - python-websockify \ - python-webtest \ - python-werkzeug \ - python-wsme \ - && yum clean all + crux \ + mariadb \ + mariadb-libs \ + openssl \ + openstack-utils \ + pyparsing \ + python-alembic \ + python-amqp \ + python-amqplib \ + python-anyjson \ + python-boto \ + python-cheetah \ + python-cliff \ + python-cmd2 \ + python-croniter \ + python-crypto \ + python-d2to1 \ + python-docutils \ + python-dogpile-cache \ + python-dogpile-core \ + python-empy \ + python-eventlet \ + python-flask \ + python-futures \ + python-greenlet \ + python-httplib2 \ + python-iso8601 \ + python-itsdangerous \ + python-jinja2 \ + python-jsonpatch \ + python-jsonpath-rw \ + python-jsonpointer \ + python-jsonschema \ + python-keyring \ + python-kombu \ + python-ldap \ + python-lesscpy \ + python-lockfile \ + python-lxml \ + python-markdown \ + python-memcached \ + python-migrate \ + python-msgpack \ + python-netifaces \ + python-networkx \ + python-oauthlib \ + python-oslo-config \ + python-oslo-messaging \ + python-oslo-rootwrap \ + python-paramiko \ + python-passlib \ + python-paste-deploy \ + python-pbr \ + python-pecan \ + python-ply \ + python-prettytable \ + python-psutil \ + python-pycadf \ + python-pygments \ + python-pymongo \ + python-qpid \ + python-repoze-lru \ + python-requests \ + python-routes \ + python-simplegeneric \ + python-simplejson \ + python-singledispatch \ + python-six \ + python-sqlalchemy \ + python-stevedore \ + python-taskflow \ + python-versiontools \ + python-warlock \ + python-webob \ + python-websockify \ + python-webtest \ + python-werkzeug \ + python-wsme \ + && yum clean all # This is dirty like zebra. This works around a bug in Ubuntu 14.04 LTS. The # --net=host option does not work on ubuntu 14.04 because of a kernel bug. One @@ -108,5 +110,4 @@ RUN yum -y install pam+noaudit && yum clean all # End dirty like zebra RUN mkdir -p /opt/kolla -ADD service_hosts.sh /opt/kolla/service_hosts.sh -ADD kolla-common.sh /opt/kolla/kolla-common.sh +COPY service_hosts.sh kolla-common.sh /opt/kolla/ |