diff --git a/docker_templates/base/Dockerfile.j2 b/docker_templates/base/Dockerfile.j2
new file mode 100644
index 0000000000000000000000000000000000000000..4e6624b634826a7dd19a77501028fbb653809416
--- /dev/null
+++ b/docker_templates/base/Dockerfile.j2
@@ -0,0 +1,219 @@
+FROM {{ base_distro }}:{{ base_distro_tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
+ {% if install_type == 'binary' %}
+ {% if base_distro == 'centos' %}
+
+# Set up repositories
+# This repository provides all dependencies used by RDO OpenStack
+RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm
+
+# This repository provides latest packages built from trunk master into RPMs
+RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo
+
+# This repository turns off auth in PAM so we can operate on Ubuntu 14.04
+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 \
+ && rpm -e --nodeps yum-plugin-fastestmirror \
+ && yum -d 10 -y install systemd systemd-libs systemd-devel \
+ && yum clean all
+
+ # Endif for base_distro centos
+ {% elif base_distro == 'fedora' %}
+
+# Set up repositories
+RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
+ && yum -y install dnf dnf-plugins-core \
+ && yum clean all \
+ && dnf copr enable -y sdake/pam.noaudit
+
+ # Endif for base_distro fedora
+ {% endif %}
+
+# Update packages
+RUN yum update -y \
+ && yum install -y epel-release \
+ && yum clean all
+
+# Install base packages
+RUN yum install -y \
+ git \
+ iproute \
+ 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-oslo-policy \
+ python-paramiko \
+ python-passlib \
+ python-paste-deploy \
+ python-pbr \
+ python-pecan \
+ python-pip \
+ 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
+
+# TODO(inc0): when oslo_service lands in delorean, change pip to yum
+# necessary until https://bugzilla.redhat.com/show_bug.cgi?id=1229477 is fixed
+
+# 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 buid pam without authentication.
+# See:
+# https://registry.hub.docker.com/u/sequenceiq/pam/
+#
+RUN rpm -e --nodeps pam \
+ && yum -y install pam+noaudit \
+ && yum clean all
+# End dirty like zebra
+
+ # Endif for install_type binary
+ {% elif install_type == 'source' %}
+
+# Update packages
+RUN yum update -y \
+ && yum install -y \
+ epel-release \
+ gcc \
+ git \
+ libffi-devel \
+ libxml2-devel \
+ libxslt-devel \
+ mariadb \
+ mariadb-devel \
+ mysql-devel \
+ MySQL-python \
+ openldap-devel \
+ openssl \
+ openssl-devel \
+ postgresql \
+ postgresql-devel \
+ python-devel \
+ python-oslo-policy \
+ sqlite-devel \
+ tar \
+ && yum clean all
+
+ # Endif for install_type source
+ {% endif %}
+
+# Endif for base_distro centos,fedora,oraclelinux
+{% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends software-properties-common \
+ && add-apt-repository cloud-archive:kilo \
+ && apt-get update \
+ && apt-get upgrade -y \
+ && apt-get dist-upgrade -y \
+ && apt-get install -y --no-install-recommends \
+ curl \
+ openssl \
+ && apt-get clean
+
+ {% if install_type == 'source' %}
+
+RUN apt-get install -y --no-install-recommends \
+ gcc \
+ git \
+ ldap-utils \
+ libffi-dev \
+ libxml2-dev \
+ libxslt-dev \
+ mysql-server\
+ postgresql \
+ python-dev \
+ python-oslo-policy \
+ slapd \
+ sqlite \
+ tar \
+ && apt-get clean
+
+ # Endif for install_type source
+ {% endif %}
+{% endif %}
+
+{% if install_type == 'source' %}
+
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
+ && python get-pip.py \
+ && rm get-pip.py
+
+RUN pip install --upgrade \
+ pip \
+ wheel
+
+# Endif for install_type source
+{% endif %}
+
+COPY kolla-common.sh /opt/kolla/
diff --git a/docker_templates/base/kolla-common.sh b/docker_templates/base/kolla-common.sh
new file mode 120000
index 0000000000000000000000000000000000000000..03ffb4e73bd00d6e0c0b6cab8835d6072242fc91
--- /dev/null
+++ b/docker_templates/base/kolla-common.sh
@@ -0,0 +1 @@
+../../docker/common/base/kolla-common.sh
\ No newline at end of file
diff --git a/tools/build.py b/tools/build.py
index ac471960b3457be5f5a20c25b5c03bd39e5ba259..a2959fe308cec79ca0581e9fe92e4ad8981a8b4d 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -33,6 +33,7 @@ import time
import traceback
import docker
+import jinja2
class WorkerThread(Thread):
@@ -102,6 +103,10 @@ def argParser():
help='The base distro to use when building',
type=str,
default='centos')
+ parser.add_argument('--base-tag',
+ help='The base distro image tag',
+ type=str,
+ default='latest')
parser.add_argument('-t', '--type',
help='The method of the Openstack install',
type=str,
@@ -122,6 +127,10 @@ def argParser():
help='The number of threads to use while building',
type=int,
default=8)
+ parser.add_argument('--template',
+ help='Create dockerfiles from templates',
+ action='store_true',
+ default=False)
return vars(parser.parse_args())
@@ -130,9 +139,11 @@ class KollaWorker(object):
def __init__(self, args):
self.kolla_dir = os.path.join(sys.path[0], '..')
self.images_dir = os.path.join(self.kolla_dir, 'docker')
-
+ self.templates_dir = os.path.join(self.kolla_dir, 'docker_templates')
self.namespace = args['namespace']
+ self.template = args['template']
self.base = args['base']
+ self.base_tag = args['base_tag']
self.type_ = args['type']
self.tag = args['tag']
self.prefix = self.base + '-' + self.type_ + '-'
@@ -143,15 +154,36 @@ class KollaWorker(object):
ts = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d_%H-%M-%S_')
self.temp_dir = tempfile.mkdtemp(prefix='kolla-' + ts)
self.working_dir = os.path.join(self.temp_dir, 'docker')
- shutil.copytree(self.images_dir, self.working_dir)
+ if self.template:
+ shutil.copytree(self.templates_dir, self.working_dir)
+ else:
+ shutil.copytree(self.images_dir, self.working_dir)
+
+ def createDockerfiles(self):
+ for path in self.docker_build_paths:
+ template_name = "Dockerfile.j2"
+ env = jinja2.Environment(loader=jinja2.FileSystemLoader(path))
+ template = env.get_template(template_name)
+ values = {'base_distro': self.base,
+ 'base_distro_tag': self.base_tag,
+ 'install_type': self.type_}
+ content = template.render(values)
+ with open(os.path.join(path, 'Dockerfile'), 'w') as f:
+ f.write(content)
def findDockerfiles(self):
"""Recursive search for Dockerfiles in the working directory"""
self.docker_build_paths = list()
- path = os.path.join(self.working_dir, self.base, self.type_)
+
+ if self.template:
+ path = self.working_dir
+ filename = 'Dockerfile.j2'
+ else:
+ path = os.path.join(self.working_dir, self.base, self.type_)
+ filename = 'Dockerfile'
for root, dirs, names in os.walk(path):
- if 'Dockerfile' in names:
+ if filename in names:
self.docker_build_paths.append(root)
def cleanup(self):
@@ -276,6 +308,10 @@ def main():
kolla = KollaWorker(args)
kolla.setupWorkingDir()
kolla.findDockerfiles()
+
+ if args['template']:
+ kolla.createDockerfiles()
+
pools = kolla.buildQueues()
# Returns a list of Queues for us to loop through