Merge "Glance installation from source"

17 files changed, 57 insertions, 0 deletions

diff --git a/docker/centos/source/glance/glance-api/Dockerfile b/docker/centos/source/glance/glance-api/Dockerfile
new file mode 100644
index 000000000..8b870b0ae
--- /dev/null
+++ b/docker/centos/source/glance/glance-api/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh check.sh /
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/glance/glance-api/build b/docker/centos/source/glance/glance-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/glance/glance-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-api/check.sh b/docker/centos/source/glance/glance-api/check.sh
new file mode 120000
index 000000000..73dd5e253
--- /dev/null
+++ b/docker/centos/source/glance/glance-api/check.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-api/config-external.sh b/docker/centos/source/glance/glance-api/config-external.sh
new file mode 120000
index 000000000..46a22b7b3
--- /dev/null
+++ b/docker/centos/source/glance/glance-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-api/config-internal.sh b/docker/centos/source/glance/glance-api/config-internal.sh
new file mode 120000
index 000000000..112e6557c
--- /dev/null
+++ b/docker/centos/source/glance/glance-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-api/start.sh b/docker/centos/source/glance/glance-api/start.sh
new file mode 120000
index 000000000..6740e1fe9
--- /dev/null
+++ b/docker/centos/source/glance/glance-api/start.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-base/.buildinfo b/docker/centos/source/glance/glance-base/.buildinfo
new file mode 100644
index 000000000..19c048a7e
--- /dev/null
+++ b/docker/centos/source/glance/glance-base/.buildinfo
@@ -0,0 +1,9 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+COMPONENT=glance
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/glance}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/glance/glance-master.tar.gz}
diff --git a/docker/centos/source/glance/glance-base/Dockerfile b/docker/centos/source/glance/glance-base/Dockerfile
new file mode 100644
index 000000000..82490ae2d
--- /dev/null
+++ b/docker/centos/source/glance/glance-base/Dockerfile
@@ -0,0 +1,16 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./glance.tar /
+RUN ln -s /glance-* /glance
+
+RUN cd /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
+
+COPY config-glance.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/glance/glance-base/build b/docker/centos/source/glance/glance-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/glance/glance-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-base/config-glance.sh b/docker/centos/source/glance/glance-base/config-glance.sh
new file mode 120000
index 000000000..d5c26f0b8
--- /dev/null
+++ b/docker/centos/source/glance/glance-base/config-glance.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-base/config-glance.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-data/Dockerfile b/docker/centos/source/glance/glance-data/Dockerfile
new file mode 100644
index 000000000..e99c60eca
--- /dev/null
+++ b/docker/centos/source/glance/glance-data/Dockerfile
@@ -0,0 +1,5 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+VOLUME [ "/var/lib/glance" ]
+CMD ["/bin/true"]
diff --git a/docker/centos/source/glance/glance-data/build b/docker/centos/source/glance/glance-data/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/glance/glance-data/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-registry/Dockerfile b/docker/centos/source/glance/glance-registry/Dockerfile
new file mode 100644
index 000000000..03eb22f4a
--- /dev/null
+++ b/docker/centos/source/glance/glance-registry/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+COPY start.sh /
+CMD ["/start.sh"]
diff --git a/docker/centos/source/glance/glance-registry/build b/docker/centos/source/glance/glance-registry/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/glance/glance-registry/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-registry/config-external.sh b/docker/centos/source/glance/glance-registry/config-external.sh
new file mode 120000
index 000000000..cfcbd1391
--- /dev/null
+++ b/docker/centos/source/glance/glance-registry/config-external.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-registry/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-registry/config-internal.sh b/docker/centos/source/glance/glance-registry/config-internal.sh
new file mode 120000
index 000000000..c3d48cfc0
--- /dev/null
+++ b/docker/centos/source/glance/glance-registry/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-registry/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/glance/glance-registry/start.sh b/docker/centos/source/glance/glance-registry/start.sh
new file mode 120000
index 000000000..1295cdc31
--- /dev/null
+++ b/docker/centos/source/glance/glance-registry/start.sh
@@ -0,0 +1 @@
+../../../../common/glance/glance-registry/start.sh
\ No newline at end of file