From d30f69bc8327bf37e013c9647c99d9192eec8830 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 4 May 2015 17:26:30 -0700 Subject: Port to icehouse This represents making build-docker-images --release build with the icehouse tag and causes docker-compsoe to pull from the icehouse tag. Partially-implements: blueprint port-kilo Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50 --- docker/ceilometer/ceilometer-alarm/Dockerfile | 2 +- docker/ceilometer/ceilometer-api/Dockerfile | 2 +- docker/ceilometer/ceilometer-base/Dockerfile | 2 +- docker/ceilometer/ceilometer-central/Dockerfile | 2 +- docker/ceilometer/ceilometer-collector/Dockerfile | 2 +- docker/ceilometer/ceilometer-compute/Dockerfile | 2 +- docker/ceilometer/ceilometer-notification/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docker/ceilometer') diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile b/docker/ceilometer/ceilometer-alarm/Dockerfile index fc8d7742e..fe6c44fc2 100644 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% 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 aaaf7c8df..7a1337c7b 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile +++ b/docker/ceilometer/ceilometer-api/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% 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 ba2506e3a..6aaf77ab2 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile +++ b/docker/ceilometer/ceilometer-base/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% 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 18ed633d6..bd5137306 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile +++ b/docker/ceilometer/ceilometer-central/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% 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 b654b2622..6c54dce4a 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile +++ b/docker/ceilometer/ceilometer-collector/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% 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 4b03c4f00..9f2a701d8 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile +++ b/docker/ceilometer/ceilometer-compute/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% 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 1f8795645..72d291bcb 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile +++ b/docker/ceilometer/ceilometer-notification/Dockerfile @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y openstack-ceilometer-notification && yum clean all -- cgit v1.2.3