From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
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-api/Dockerfile.j2           |  9 ++++++++
 docker/glance/glance-api/config-external.sh      | 10 +++++++++
 docker/glance/glance-api/start.sh                | 20 +++++++++++++++++
 docker/glance/glance-base/Dockerfile.j2          | 28 ++++++++++++++++++++++++
 docker/glance/glance-registry/Dockerfile.j2      |  9 ++++++++
 docker/glance/glance-registry/config-external.sh | 10 +++++++++
 docker/glance/glance-registry/start.sh           | 13 +++++++++++
 7 files changed, 99 insertions(+)
 create mode 100644 docker/glance/glance-api/Dockerfile.j2
 create mode 100755 docker/glance/glance-api/config-external.sh
 create mode 100755 docker/glance/glance-api/start.sh
 create mode 100644 docker/glance/glance-base/Dockerfile.j2
 create mode 100644 docker/glance/glance-registry/Dockerfile.j2
 create mode 100755 docker/glance/glance-registry/config-external.sh
 create mode 100755 docker/glance/glance-registry/start.sh

(limited to 'docker/glance')

diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
new file mode 100644
index 000000000..e603a6c36
--- /dev/null
+++ b/docker/glance/glance-api/Dockerfile.j2
@@ -0,0 +1,9 @@
+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"]
+
+{{ include_footer }}
diff --git a/docker/glance/glance-api/config-external.sh b/docker/glance/glance-api/config-external.sh
new file mode 100755
index 000000000..ce5411738
--- /dev/null
+++ b/docker/glance/glance-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/glance-api/glance-api.conf"
+TARGET="/etc/glance/glance-api.conf"
+OWNER="glance"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh
new file mode 100755
index 000000000..ce3cb6d8b
--- /dev/null
+++ b/docker/glance/glance-api/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/glance-api"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    su -s /bin/sh -c "glance-manage db_sync" glance
+    exit 0
+fi
+
+exec $CMD $ARGS
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 %}
diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2
new file mode 100644
index 000000000..e603a6c36
--- /dev/null
+++ b/docker/glance/glance-registry/Dockerfile.j2
@@ -0,0 +1,9 @@
+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"]
+
+{{ include_footer }}
diff --git a/docker/glance/glance-registry/config-external.sh b/docker/glance/glance-registry/config-external.sh
new file mode 100755
index 000000000..37abd136d
--- /dev/null
+++ b/docker/glance/glance-registry/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/glance-registry/glance-registry.conf"
+TARGET="/etc/glance/glance-registry.conf"
+OWNER="glance"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh
new file mode 100755
index 000000000..1d8265f80
--- /dev/null
+++ b/docker/glance/glance-registry/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/glance-registry"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
-- 
cgit v1.2.3