Merge "Add build from source for gnocchi"

14 files changed, 53 insertions, 0 deletions

diff --git a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile
new file mode 100644
index 000000000..5c173f51e
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY ./start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-api/build b/docker/centos/source/gnocchi/gnocchi-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-api/config-external.sh b/docker/centos/source/gnocchi/gnocchi-api/config-external.sh
new file mode 120000
index 000000000..471d03664
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/gnocchi/gnocchi-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh
new file mode 120000
index 000000000..79578ce60
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/gnocchi/gnocchi-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-api/start.sh b/docker/centos/source/gnocchi/gnocchi-api/start.sh
new file mode 120000
index 000000000..99320c6d0
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-api/start.sh
@@ -0,0 +1 @@
+../../../../common/gnocchi/gnocchi-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-base/.buildinfo b/docker/centos/source/gnocchi/gnocchi-base/.buildinfo
new file mode 100644
index 000000000..a89f3419d
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-base/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=gnocchi
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/gnocchi}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz}
diff --git a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
new file mode 100644
index 000000000..2be4324ec
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile
@@ -0,0 +1,17 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./gnocchi.tar /
+RUN ln -s /gnocchi-* /gnocchi
+
+RUN cd /gnocchi \
+    && useradd --user-group gnocchi \
+    && pip install -r requirements.txt \
+    && pip install /gnocchi \
+    && mkdir /etc/gnocchi /var/log/gnocchi \
+    && cp -r /gnocchi/etc/* /etc/gnocchi/ \
+    && rm -rf /root/.cache
+
+COPY config-gnocchi.sh /opt/kolla/config-gnocchi.sh
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-base/build b/docker/centos/source/gnocchi/gnocchi-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh b/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh
new file mode 120000
index 000000000..75a8a5e10
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-base/config-gnocchi.sh
@@ -0,0 +1 @@
+../../../../common/gnocchi/gnocchi-base/config-gnocchi.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile
new file mode 100644
index 000000000..5c173f51e
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY ./start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/build b/docker/centos/source/gnocchi/gnocchi-statsd/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-statsd/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh b/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh
new file mode 120000
index 000000000..fe516e42c
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh
@@ -0,0 +1 @@
+../../../../common/gnocchi/gnocchi-statsd/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh b/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh
new file mode 120000
index 000000000..9d9ebfa7d
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-statsd/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/gnocchi/gnocchi-statsd/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/start.sh b/docker/centos/source/gnocchi/gnocchi-statsd/start.sh
new file mode 120000
index 000000000..ad961553e
--- /dev/null
+++ b/docker/centos/source/gnocchi/gnocchi-statsd/start.sh
@@ -0,0 +1 @@
+../../../../common/gnocchi/gnocchi-statsd/start.sh
\ No newline at end of file