From 23a7fa286973be3bcbfbdb17317b144ef74fa02c Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Tue, 19 May 2015 05:42:26 -0500 Subject: Separate base images into different folders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This moves a few things around. Namely centos/fedora-rdo-base becomes centos/rdo/base fedora/rdo/base I have also separated out RHEL. Moves the current scripts in "base" to a "common" folder common to all images and then recreates the appropriate links to allow all the containers to build the same way they did before. This removes all .buildconfs in the system (though they are still usable) Partially Implements: blueprint refactor-base-image-layout Co-Authored-By: Martin André Change-Id: Id63eac1eb9893ceb775c28bf22842dede85c214a --- docker/fedora | 1 - docker/fedora/binary/barbican | 1 + docker/fedora/binary/base/Dockerfile | 109 +++++++++++++++++++++++++++++ docker/fedora/binary/base/build | 1 + docker/fedora/binary/base/kolla-common.sh | 1 + docker/fedora/binary/base/service_hosts.sh | 1 + docker/fedora/binary/ceilometer | 1 + docker/fedora/binary/cinder | 1 + docker/fedora/binary/designate | 1 + docker/fedora/binary/docker-compose | 1 + docker/fedora/binary/glance | 1 + docker/fedora/binary/hautoproxy | 1 + docker/fedora/binary/heat | 1 + docker/fedora/binary/horizon | 1 + docker/fedora/binary/keystone | 1 + docker/fedora/binary/magnum | 1 + docker/fedora/binary/mariadb-app | 1 + docker/fedora/binary/mariadb-data | 1 + docker/fedora/binary/mongodb | 1 + docker/fedora/binary/neutron | 1 + docker/fedora/binary/nova-base | 1 + docker/fedora/binary/nova-compute | 1 + docker/fedora/binary/nova-controller | 1 + docker/fedora/binary/rabbitmq | 1 + docker/fedora/binary/swift | 1 + docker/fedora/binary/zaqar | 1 + docker/fedora/rdo | 1 + 27 files changed, 134 insertions(+), 1 deletion(-) delete mode 120000 docker/fedora create mode 120000 docker/fedora/binary/barbican create mode 100644 docker/fedora/binary/base/Dockerfile create mode 120000 docker/fedora/binary/base/build create mode 120000 docker/fedora/binary/base/kolla-common.sh create mode 120000 docker/fedora/binary/base/service_hosts.sh create mode 120000 docker/fedora/binary/ceilometer create mode 120000 docker/fedora/binary/cinder create mode 120000 docker/fedora/binary/designate create mode 120000 docker/fedora/binary/docker-compose create mode 120000 docker/fedora/binary/glance create mode 120000 docker/fedora/binary/hautoproxy create mode 120000 docker/fedora/binary/heat create mode 120000 docker/fedora/binary/horizon create mode 120000 docker/fedora/binary/keystone create mode 120000 docker/fedora/binary/magnum create mode 120000 docker/fedora/binary/mariadb-app create mode 120000 docker/fedora/binary/mariadb-data create mode 120000 docker/fedora/binary/mongodb create mode 120000 docker/fedora/binary/neutron create mode 120000 docker/fedora/binary/nova-base create mode 120000 docker/fedora/binary/nova-compute create mode 120000 docker/fedora/binary/nova-controller create mode 120000 docker/fedora/binary/rabbitmq create mode 120000 docker/fedora/binary/swift create mode 120000 docker/fedora/binary/zaqar create mode 120000 docker/fedora/rdo (limited to 'docker/fedora') diff --git a/docker/fedora b/docker/fedora deleted file mode 120000 index 95e189549..000000000 --- a/docker/fedora +++ /dev/null @@ -1 +0,0 @@ -centos \ No newline at end of file diff --git a/docker/fedora/binary/barbican b/docker/fedora/binary/barbican new file mode 120000 index 000000000..7dd5c24ce --- /dev/null +++ b/docker/fedora/binary/barbican @@ -0,0 +1 @@ +../../centos/binary/barbican \ No newline at end of file diff --git a/docker/fedora/binary/base/Dockerfile b/docker/fedora/binary/base/Dockerfile new file mode 100644 index 000000000..285e128e9 --- /dev/null +++ b/docker/fedora/binary/base/Dockerfile @@ -0,0 +1,109 @@ +FROM fedora:21 +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +# Set up repositories +RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm +RUN yum -y install dnf dnf-plugins-core && yum clean all +RUN dnf copr enable -y sdake/crux +RUN dnf copr enable -y sdake/pam.noaudit + + +# Update packages +RUN yum update -y && yum clean all + +# Install base packages +RUN yum install -y \ + iproute \ + 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 +# workaround is to build pam without authentication. +# See: +# https://registry.hub.docker.com/u/sequenceiq/pam/ +# +RUN rpm -e --nodeps pam +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 diff --git a/docker/fedora/binary/base/build b/docker/fedora/binary/base/build new file mode 120000 index 000000000..8d652f7ee --- /dev/null +++ b/docker/fedora/binary/base/build @@ -0,0 +1 @@ +../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/fedora/binary/base/kolla-common.sh b/docker/fedora/binary/base/kolla-common.sh new file mode 120000 index 000000000..380efbc3d --- /dev/null +++ b/docker/fedora/binary/base/kolla-common.sh @@ -0,0 +1 @@ +../../../common/kolla-common.sh \ No newline at end of file diff --git a/docker/fedora/binary/base/service_hosts.sh b/docker/fedora/binary/base/service_hosts.sh new file mode 120000 index 000000000..777b7334d --- /dev/null +++ b/docker/fedora/binary/base/service_hosts.sh @@ -0,0 +1 @@ +../../../common/service_hosts.sh \ No newline at end of file diff --git a/docker/fedora/binary/ceilometer b/docker/fedora/binary/ceilometer new file mode 120000 index 000000000..b9f08a71f --- /dev/null +++ b/docker/fedora/binary/ceilometer @@ -0,0 +1 @@ +../../centos/binary/ceilometer \ No newline at end of file diff --git a/docker/fedora/binary/cinder b/docker/fedora/binary/cinder new file mode 120000 index 000000000..037fd7f7e --- /dev/null +++ b/docker/fedora/binary/cinder @@ -0,0 +1 @@ +../../centos/binary/cinder \ No newline at end of file diff --git a/docker/fedora/binary/designate b/docker/fedora/binary/designate new file mode 120000 index 000000000..5090326fe --- /dev/null +++ b/docker/fedora/binary/designate @@ -0,0 +1 @@ +../../centos/binary/designate \ No newline at end of file diff --git a/docker/fedora/binary/docker-compose b/docker/fedora/binary/docker-compose new file mode 120000 index 000000000..287f1cd13 --- /dev/null +++ b/docker/fedora/binary/docker-compose @@ -0,0 +1 @@ +../../centos/binary/docker-compose \ No newline at end of file diff --git a/docker/fedora/binary/glance b/docker/fedora/binary/glance new file mode 120000 index 000000000..4b4131254 --- /dev/null +++ b/docker/fedora/binary/glance @@ -0,0 +1 @@ +../../centos/binary/glance \ No newline at end of file diff --git a/docker/fedora/binary/hautoproxy b/docker/fedora/binary/hautoproxy new file mode 120000 index 000000000..916cfd197 --- /dev/null +++ b/docker/fedora/binary/hautoproxy @@ -0,0 +1 @@ +../../centos/binary/hautoproxy \ No newline at end of file diff --git a/docker/fedora/binary/heat b/docker/fedora/binary/heat new file mode 120000 index 000000000..a675ed4cb --- /dev/null +++ b/docker/fedora/binary/heat @@ -0,0 +1 @@ +../../centos/binary/heat \ No newline at end of file diff --git a/docker/fedora/binary/horizon b/docker/fedora/binary/horizon new file mode 120000 index 000000000..c460446ee --- /dev/null +++ b/docker/fedora/binary/horizon @@ -0,0 +1 @@ +../../centos/binary/horizon \ No newline at end of file diff --git a/docker/fedora/binary/keystone b/docker/fedora/binary/keystone new file mode 120000 index 000000000..fb666c53b --- /dev/null +++ b/docker/fedora/binary/keystone @@ -0,0 +1 @@ +../../centos/binary/keystone \ No newline at end of file diff --git a/docker/fedora/binary/magnum b/docker/fedora/binary/magnum new file mode 120000 index 000000000..d5c1f84ed --- /dev/null +++ b/docker/fedora/binary/magnum @@ -0,0 +1 @@ +../../centos/binary/magnum \ No newline at end of file diff --git a/docker/fedora/binary/mariadb-app b/docker/fedora/binary/mariadb-app new file mode 120000 index 000000000..017d6c212 --- /dev/null +++ b/docker/fedora/binary/mariadb-app @@ -0,0 +1 @@ +../../centos/binary/mariadb-app \ No newline at end of file diff --git a/docker/fedora/binary/mariadb-data b/docker/fedora/binary/mariadb-data new file mode 120000 index 000000000..095a5e84f --- /dev/null +++ b/docker/fedora/binary/mariadb-data @@ -0,0 +1 @@ +../../centos/binary/mariadb-data \ No newline at end of file diff --git a/docker/fedora/binary/mongodb b/docker/fedora/binary/mongodb new file mode 120000 index 000000000..486f6030f --- /dev/null +++ b/docker/fedora/binary/mongodb @@ -0,0 +1 @@ +../../centos/binary/mongodb \ No newline at end of file diff --git a/docker/fedora/binary/neutron b/docker/fedora/binary/neutron new file mode 120000 index 000000000..09ccb9467 --- /dev/null +++ b/docker/fedora/binary/neutron @@ -0,0 +1 @@ +../../centos/binary/neutron \ No newline at end of file diff --git a/docker/fedora/binary/nova-base b/docker/fedora/binary/nova-base new file mode 120000 index 000000000..7600927f2 --- /dev/null +++ b/docker/fedora/binary/nova-base @@ -0,0 +1 @@ +../../centos/binary/nova-base \ No newline at end of file diff --git a/docker/fedora/binary/nova-compute b/docker/fedora/binary/nova-compute new file mode 120000 index 000000000..ab70e1c1b --- /dev/null +++ b/docker/fedora/binary/nova-compute @@ -0,0 +1 @@ +../../centos/binary/nova-compute \ No newline at end of file diff --git a/docker/fedora/binary/nova-controller b/docker/fedora/binary/nova-controller new file mode 120000 index 000000000..d4e6ba4ef --- /dev/null +++ b/docker/fedora/binary/nova-controller @@ -0,0 +1 @@ +../../centos/binary/nova-controller \ No newline at end of file diff --git a/docker/fedora/binary/rabbitmq b/docker/fedora/binary/rabbitmq new file mode 120000 index 000000000..d6f927fc9 --- /dev/null +++ b/docker/fedora/binary/rabbitmq @@ -0,0 +1 @@ +../../centos/binary/rabbitmq \ No newline at end of file diff --git a/docker/fedora/binary/swift b/docker/fedora/binary/swift new file mode 120000 index 000000000..b4416ea0f --- /dev/null +++ b/docker/fedora/binary/swift @@ -0,0 +1 @@ +../../centos/binary/swift \ No newline at end of file diff --git a/docker/fedora/binary/zaqar b/docker/fedora/binary/zaqar new file mode 120000 index 000000000..1adc217cb --- /dev/null +++ b/docker/fedora/binary/zaqar @@ -0,0 +1 @@ +../../centos/binary/zaqar \ No newline at end of file diff --git a/docker/fedora/rdo b/docker/fedora/rdo new file mode 120000 index 000000000..cab89b7b4 --- /dev/null +++ b/docker/fedora/rdo @@ -0,0 +1 @@ +binary \ No newline at end of file -- cgit v1.2.3