From 02bb5f90001e5415c156a58a6e6caa0283bc7d3b Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 12 Aug 2015 06:50:55 +0000
Subject: [PATCH] Add Dockerfile template for glance
Change-Id: I984940ec9251bf65ddd1448425909a2c9108afd8
Partially-Implements: blueprint dockerfile-template
---
.../glance/glance-api/Dockerfile.j2 | 7 +++++
.../glance/glance-api/config-external.sh | 1 +
docker_templates/glance/glance-api/start.sh | 1 +
.../glance/glance-base/Dockerfile.j2 | 31 +++++++++++++++++++
.../glance/glance-registry/Dockerfile.j2 | 7 +++++
.../glance/glance-registry/config-external.sh | 1 +
.../glance/glance-registry/start.sh | 1 +
7 files changed, 49 insertions(+)
create mode 100644 docker_templates/glance/glance-api/Dockerfile.j2
create mode 120000 docker_templates/glance/glance-api/config-external.sh
create mode 120000 docker_templates/glance/glance-api/start.sh
create mode 100644 docker_templates/glance/glance-base/Dockerfile.j2
create mode 100644 docker_templates/glance/glance-registry/Dockerfile.j2
create mode 120000 docker_templates/glance/glance-registry/config-external.sh
create mode 120000 docker_templates/glance/glance-registry/start.sh
diff --git a/docker_templates/glance/glance-api/Dockerfile.j2 b/docker_templates/glance/glance-api/Dockerfile.j2
new file mode 100644
index 0000000000..f652822f5e
--- /dev/null
+++ b/docker_templates/glance/glance-api/Dockerfile.j2
@@ -0,0 +1,7 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/glance/glance-api/config-external.sh b/docker_templates/glance/glance-api/config-external.sh
new file mode 120000
index 0000000000..4261b90e19
--- /dev/null
+++ b/docker_templates/glance/glance-api/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/glance/glance-api/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/glance/glance-api/start.sh b/docker_templates/glance/glance-api/start.sh
new file mode 120000
index 0000000000..395aafe82e
--- /dev/null
+++ b/docker_templates/glance/glance-api/start.sh
@@ -0,0 +1 @@
+../../../docker/common/glance/glance-api/start.sh
\ No newline at end of file
diff --git a/docker_templates/glance/glance-base/Dockerfile.j2 b/docker_templates/glance/glance-base/Dockerfile.j2
new file mode 100644
index 0000000000..1a092f1a76
--- /dev/null
+++ b/docker_templates/glance/glance-base/Dockerfile.j2
@@ -0,0 +1,31 @@
+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
+
+RUN cd /glance \
+ && useradd --user-group glance \
+ && pip install -r requirements.txt \
+ && pip install /glance \
+ && mkdir /etc/glance /var/log/glance \
+ && cp -r /glance/etc/* /etc/glance/ \
+ && rm -rf /root/.cache
+
+{% endif %}
diff --git a/docker_templates/glance/glance-registry/Dockerfile.j2 b/docker_templates/glance/glance-registry/Dockerfile.j2
new file mode 100644
index 0000000000..f652822f5e
--- /dev/null
+++ b/docker_templates/glance/glance-registry/Dockerfile.j2
@@ -0,0 +1,7 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker_templates/glance/glance-registry/config-external.sh b/docker_templates/glance/glance-registry/config-external.sh
new file mode 120000
index 0000000000..c652dc476c
--- /dev/null
+++ b/docker_templates/glance/glance-registry/config-external.sh
@@ -0,0 +1 @@
+../../../docker/common/glance/glance-registry/config-external.sh
\ No newline at end of file
diff --git a/docker_templates/glance/glance-registry/start.sh b/docker_templates/glance/glance-registry/start.sh
new file mode 120000
index 0000000000..72d1278abc
--- /dev/null
+++ b/docker_templates/glance/glance-registry/start.sh
@@ -0,0 +1 @@
+../../../docker/common/glance/glance-registry/start.sh
\ No newline at end of file
--
GitLab