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/glance/glance-base/Dockerfile.j2 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 docker/glance/glance-base/Dockerfile.j2 (limited to 'docker/glance/glance-base') diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 new file mode 100644 index 000000000..8fad82106 --- /dev/null +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -0,0 +1,28 @@ +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-glance \ + python-oslo-i18n \ + && yum clean all + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + + {% endif %} +{% elif install_type == 'source' %} + +ADD glance.tar / +RUN ln -s /glance-* glance \ + && useradd --user-group glance \ + && pip --no-cache-dir install /glance \ + && mkdir -p /etc/glance /var/log/glance /home/glance \ + && cp -r /glance/etc/* /etc/glance/ \ + && chown -R glance: /etc/glance /var/log/glance /home/glance + +{% endif %} -- cgit v1.2.3