From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 28 Aug 2015 12:16:53 +0000 Subject: Move docker_templates to docker dir Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir --- docker/cinder/cinder-base/Dockerfile.j2 | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 docker/cinder/cinder-base/Dockerfile.j2 (limited to 'docker/cinder/cinder-base') diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 new file mode 100644 index 000000000..1cce34a9e --- /dev/null +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -0,0 +1,49 @@ +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +{% if install_type == 'binary' %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + +RUN yum -y install openstack-cinder \ + python-automaton \ + lvm2 \ + && yum clean all \ + && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \ + && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf + +# NOTE(sdake): The sed operations make LVM tools work inside a container - see +# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} +{% elif install_type == 'source' %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + +RUN yum -y install lvm2 \ + && yum clean all + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN apt-get install -y --no-install-recommends lvm2 \ + && apt-get clean + + {% endif %} + +ADD cinder.tar / +RUN ln -s /cinder-* cinder \ + && useradd --user-group cinder \ + && pip --no-cache-dir install /cinder \ + && mkdir -p /etc/cinder /var/log/cinder /home/cinder \ + && cp -r /cinder/etc/cinder/* /etc/cinder/ \ + && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder \ + && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \ + && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf + +# NOTE(sdake): The sed operations make LVM tools work inside a container - see +# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw + +{% endif %} -- cgit v1.2.3