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/centos/binary/fedora-binary-base/.buildconf | 1 - docker/centos/binary/fedora-binary-base/Dockerfile | 109 --------------------- docker/centos/binary/fedora-binary-base/build | 1 - .../binary/fedora-binary-base/kolla-common.sh | 1 - .../binary/fedora-binary-base/service_hosts.sh | 1 - 5 files changed, 113 deletions(-) delete mode 100644 docker/centos/binary/fedora-binary-base/.buildconf delete mode 100644 docker/centos/binary/fedora-binary-base/Dockerfile delete mode 120000 docker/centos/binary/fedora-binary-base/build delete mode 120000 docker/centos/binary/fedora-binary-base/kolla-common.sh delete mode 120000 docker/centos/binary/fedora-binary-base/service_hosts.sh (limited to 'docker/centos/binary/fedora-binary-base') diff --git a/docker/centos/binary/fedora-binary-base/.buildconf b/docker/centos/binary/fedora-binary-base/.buildconf deleted file mode 100644 index d552b0d1b..000000000 --- a/docker/centos/binary/fedora-binary-base/.buildconf +++ /dev/null @@ -1 +0,0 @@ -PREFIX= diff --git a/docker/centos/binary/fedora-binary-base/Dockerfile b/docker/centos/binary/fedora-binary-base/Dockerfile deleted file mode 100644 index 285e128e9..000000000 --- a/docker/centos/binary/fedora-binary-base/Dockerfile +++ /dev/null @@ -1,109 +0,0 @@ -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/centos/binary/fedora-binary-base/build b/docker/centos/binary/fedora-binary-base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/fedora-binary-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/centos/binary/fedora-binary-base/kolla-common.sh b/docker/centos/binary/fedora-binary-base/kolla-common.sh deleted file mode 120000 index fcd13a80e..000000000 --- a/docker/centos/binary/fedora-binary-base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../base/kolla-common.sh \ No newline at end of file diff --git a/docker/centos/binary/fedora-binary-base/service_hosts.sh b/docker/centos/binary/fedora-binary-base/service_hosts.sh deleted file mode 120000 index c36eb4203..000000000 --- a/docker/centos/binary/fedora-binary-base/service_hosts.sh +++ /dev/null @@ -1 +0,0 @@ -../base/service_hosts.sh \ No newline at end of file -- cgit v1.2.3