aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-04 17:26:30 -0700
committerSteven Dake <stdake@cisco.com>2015-05-06 09:58:43 -0700
commitd30f69bc8327bf37e013c9647c99d9192eec8830 (patch)
treeb3f831de844ea86a011a14fca23f97ec72b63db9 /docker/neutron
parentd8a7af93eb7b05c74082526b23cb4347851d95cf (diff)
downloadkolla-d30f69bc8327bf37e013c9647c99d9192eec8830.tar.gz
kolla-d30f69bc8327bf37e013c9647c99d9192eec8830.zip
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
Diffstat (limited to 'docker/neutron')
-rw-r--r--docker/neutron/neutron-agents/Dockerfile2
-rw-r--r--docker/neutron/neutron-base/Dockerfile2
-rw-r--r--docker/neutron/neutron-server/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/neutron/neutron-agents/Dockerfile b/docker/neutron/neutron-agents/Dockerfile
index e083aa9b8..5d50bbfc1 100644
--- a/docker/neutron/neutron-agents/Dockerfile
+++ b/docker/neutron/neutron-agents/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install supervisor
diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/neutron/neutron-base/Dockerfile
index 22922a04c..c8a5ef2d9 100644
--- a/docker/neutron/neutron-base/Dockerfile
+++ b/docker/neutron/neutron-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 yum -y install openstack-neutron-ml2 && yum clean all
diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/neutron/neutron-server/Dockerfile
index edd6ea559..8d59dd04a 100644
--- a/docker/neutron/neutron-server/Dockerfile
+++ b/docker/neutron/neutron-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages