From 0764fd7dea3f56627bb42e285cfb818cce08229e Mon Sep 17 00:00:00 2001 From: Martin André Date: Thu, 26 Feb 2015 15:00:42 +0900 Subject: 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 Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b --- docker/neutron/agents/dhcp/Dockerfile | 2 +- docker/neutron/agents/l3/Dockerfile | 2 +- docker/neutron/agents/linux-bridge/Dockerfile | 2 +- docker/neutron/agents/metadata/Dockerfile | 2 +- docker/neutron/neutron-base/Dockerfile | 2 +- docker/neutron/neutron-server/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker/neutron') diff --git a/docker/neutron/agents/dhcp/Dockerfile b/docker/neutron/agents/dhcp/Dockerfile index 082dfd939..261d4f40d 100644 --- a/docker/neutron/agents/dhcp/Dockerfile +++ b/docker/neutron/agents/dhcp/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/agents/l3/Dockerfile b/docker/neutron/agents/l3/Dockerfile index 4ff41c1bf..bf635371e 100644 --- a/docker/neutron/agents/l3/Dockerfile +++ b/docker/neutron/agents/l3/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/agents/linux-bridge/Dockerfile b/docker/neutron/agents/linux-bridge/Dockerfile index 0a8a9cbff..7f2d11320 100644 --- a/docker/neutron/agents/linux-bridge/Dockerfile +++ b/docker/neutron/agents/linux-bridge/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/agents/metadata/Dockerfile b/docker/neutron/agents/metadata/Dockerfile index 4ff41c1bf..bf635371e 100644 --- a/docker/neutron/agents/metadata/Dockerfile +++ b/docker/neutron/agents/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) # Install required packages diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/neutron/neutron-base/Dockerfile index 33bcc371f..362e5c28d 100644 --- a/docker/neutron/neutron-base/Dockerfile +++ b/docker/neutron/neutron-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 yum -y install openstack-neutron-ml2 ; yum clean all diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/neutron/neutron-server/Dockerfile index 02e2e809f..852d3c44d 100644 --- a/docker/neutron/neutron-server/Dockerfile +++ b/docker/neutron/neutron-server/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) #Install required packages -- cgit v1.2.3