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

1 files changed, 28 insertions, 0 deletions

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 %}