diff options
| author | Steven Dake <sdake@redhat.com> | 2014-09-20 10:39:52 -0700 |
|---|---|---|
| committer | Steven Dake <sdake@redhat.com> | 2014-09-20 13:49:13 -0700 |
| commit | ce94f823d4a9e689bfb3d38272d55434a7ff9627 (patch) | |
| tree | 164838d0b9d2c5a1c28c1aaa14932944d8df5a52 /docker | |
| parent | da62e71bf8041d02c42655d1f88c71067a0e5387 (diff) | |
| download | kolla-ce94f823d4a9e689bfb3d38272d55434a7ff9627.tar.gz kolla-ce94f823d4a9e689bfb3d38272d55434a7ff9627.zip | |
Base images from Fedora 20 + RDO Icehouse
Previously images were based from RHEL OSP + RDO Icehouse. This presents
a problem in that internal urls are used to access the rhel7 repositories.
For new contributors, we need something that can be accessed without special
rhel7 permissions.
mariadb and rabbitmq can from fedora
cinder, glance, keystone can from fedora-rdo-base
This patch also uses the RDO repositories from upstream. This patch also
udpates the base fedora image with latest bits.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/fedora-rdo-base/Dockerfile | 84 | ||||
| -rw-r--r-- | docker/glance/glance-api/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/glance/glance-base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/glance/glance-registry/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/keystone/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/mariadb/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile | 2 |
8 files changed, 92 insertions, 8 deletions
diff --git a/docker/cinder/Dockerfile b/docker/cinder/Dockerfile index bf86dac95..64b7dd341 100644 --- a/docker/cinder/Dockerfile +++ b/docker/cinder/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.usersys.redhat.com/lhh1/rhel-osp-base +FROM fedora-rdo-base MAINTAINER rhallise@redhat.com # Install required packages @@ -15,4 +15,4 @@ RUN /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --co ADD ./start /usr/bin/run -CMD ["/usr/bin/run"]
\ No newline at end of file +CMD ["/usr/bin/run"] diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile new file mode 100644 index 000000000..a30f5226e --- /dev/null +++ b/docker/fedora-rdo-base/Dockerfile @@ -0,0 +1,84 @@ +FROM fedora +MAINTAINER Steven Dake <sdake@redhat.com> + +RUN yum update -y + +RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm + +RUN yum install -y \ + mariadb-libs \ + 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-lesscpy \ + python-lockfile \ + python-lxml \ + python-markdown \ + python-memcached \ + python-ldap \ + 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 diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile index 10e713fa5..382445c00 100644 --- a/docker/glance/glance-api/Dockerfile +++ b/docker/glance/glance-api/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.usersys.redhat.com/larsks/glance-base +FROM glance-base MAINTAINER Lars Kellogg-Stedman <lars@redhat.com> ADD ./start.sh /start.sh diff --git a/docker/glance/glance-base/Dockerfile b/docker/glance/glance-base/Dockerfile index d9967cd7b..b76e56c32 100644 --- a/docker/glance/glance-base/Dockerfile +++ b/docker/glance/glance-base/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.usersys.redhat.com/lhh1/rhel-osp-base +FROM fedora-rdo-base MAINTAINER Lars Kellogg-Stedman <lars@redhat.com> RUN yum -y install \ diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile index 10e713fa5..e51be06ec 100644 --- a/docker/glance/glance-registry/Dockerfile +++ b/docker/glance/glance-registry/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.usersys.redhat.com/larsks/glance-base +FROM fedora-rdo-base MAINTAINER Lars Kellogg-Stedman <lars@redhat.com> ADD ./start.sh /start.sh diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile index 28b8627ce..10a75c093 100644 --- a/docker/keystone/Dockerfile +++ b/docker/keystone/Dockerfile @@ -1,4 +1,4 @@ -FROM rhel7 +FROM fedora-rdo-base MAINTAINER jlabocki@redhat.com #Install required packages diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile index 5b5e8a3ca..a77cc8a20 100644 --- a/docker/mariadb/Dockerfile +++ b/docker/mariadb/Dockerfile @@ -1,4 +1,4 @@ -FROM rhel7 +FROM fedora MAINTAINER Lars Kellogg-Stedman <lars@redhat.com> RUN yum -y install mariadb-galera-server diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile index 6d976a955..41806587c 100644 --- a/docker/rabbitmq/Dockerfile +++ b/docker/rabbitmq/Dockerfile @@ -1,4 +1,4 @@ -FROM rhel7 +FROM fedora MAINTAINER Lars Kellogg-Stedman <lars@redhat.com> RUN yum -y install rabbitmq-server; yum clean all |