summaryrefslogtreecommitdiff
path: root/docker/ceilometer
diff options
context:
space:
mode:
authorMartin André <martin.andre@kvhasia.com>2015-02-26 15:00:42 +0900
committerMartin André <martin.andre@kvhasia.com>2015-03-02 14:08:06 +0900
commit0764fd7dea3f56627bb42e285cfb818cce08229e (patch)
treeb31933605cef228bca79737cbefc94b79c5e2e8f /docker/ceilometer
parent5052e54f45998110ec10239bb715ff80d51042ab (diff)
downloadkolla-0764fd7dea3f56627bb42e285cfb818cce08229e.tar.gz
kolla-0764fd7dea3f56627bb42e285cfb818cce08229e.zip
Allow changing base image
By changing the PREFIX variable in the .buildconf one is now able to build docker images from different bases. For example, add the following line to your .buildconf file to build CentOS based images: PREFIX=centos-rdo- Default base image is Fedora. For now only RH family is supported. Additionally, changing the namespace either with the NAMESPACE variable in .buildconf or via --namespace commandline option now changes the source namespace as well from the default kollaglue one. Implements: blueprint multi-baseos Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
Diffstat (limited to 'docker/ceilometer')
-rw-r--r--docker/ceilometer/ceilometer-alarm/Dockerfile2
-rw-r--r--docker/ceilometer/ceilometer-api/Dockerfile2
-rw-r--r--docker/ceilometer/ceilometer-base/Dockerfile2
-rw-r--r--docker/ceilometer/ceilometer-central/Dockerfile2
-rw-r--r--docker/ceilometer/ceilometer-collector/Dockerfile2
-rw-r--r--docker/ceilometer/ceilometer-compute/Dockerfile2
-rw-r--r--docker/ceilometer/ceilometer-notification/Dockerfile2
7 files changed, 7 insertions, 7 deletions
diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile b/docker/ceilometer/ceilometer-alarm/Dockerfile
index 7bcbf30ae..fc8d7742e 100644
--- a/docker/ceilometer/ceilometer-alarm/Dockerfile
+++ b/docker/ceilometer/ceilometer-alarm/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile b/docker/ceilometer/ceilometer-api/Dockerfile
index 29a46b39f..a9894e2bd 100644
--- a/docker/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/ceilometer/ceilometer-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile b/docker/ceilometer/ceilometer-base/Dockerfile
index c166027cd..ba2506e3a 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile
+++ b/docker/ceilometer/ceilometer-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla
diff --git a/docker/ceilometer/ceilometer-central/Dockerfile b/docker/ceilometer/ceilometer-central/Dockerfile
index a20c6712c..18ed633d6 100644
--- a/docker/ceilometer/ceilometer-central/Dockerfile
+++ b/docker/ceilometer/ceilometer-central/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile b/docker/ceilometer/ceilometer-collector/Dockerfile
index 4630a3cdf..b654b2622 100644
--- a/docker/ceilometer/ceilometer-collector/Dockerfile
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile b/docker/ceilometer/ceilometer-compute/Dockerfile
index 07b38bcc5..4b03c4f00 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \
diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile b/docker/ceilometer/ceilometer-notification/Dockerfile
index 385a27248..1f8795645 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile
@@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-notification && yum clean all