From fb300581226f75d2f13c282d41a4e4011972ffa0 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 23 Feb 2015 21:31:13 -0700 Subject: Remove l3_ovs_wip tag from Dockerfiles These tags don't belong in docker files. Instead we should put them in the build system since the build system will be creating a custom From line in the Dockerfile. Partially-implements: blueprint multi-baseos Change-Id: I68d0a0e572e35f39dbe21f7c536d7ac4ca885da3 --- 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 +- docker/nova-controller/nova-api/Dockerfile | 2 +- docker/nova-controller/nova-conductor/Dockerfile | 2 +- docker/nova-controller/nova-scheduler/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/neutron/agents/dhcp/Dockerfile b/docker/neutron/agents/dhcp/Dockerfile index 021940c9c..e32a0eb2b 100644 --- a/docker/neutron/agents/dhcp/Dockerfile +++ b/docker/neutron/agents/dhcp/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-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 021940c9c..e32a0eb2b 100644 --- a/docker/neutron/agents/l3/Dockerfile +++ b/docker/neutron/agents/l3/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-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 40e4d17a9..2f2319c50 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:l3_ovs_wip +FROM kollaglue/fedora-rdo-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 021940c9c..e32a0eb2b 100644 --- a/docker/neutron/agents/metadata/Dockerfile +++ b/docker/neutron/agents/metadata/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-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 bf5618817..33bcc371f 100644 --- a/docker/neutron/neutron-base/Dockerfile +++ b/docker/neutron/neutron-base/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-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 6c3025e0c..02e2e809f 100644 --- a/docker/neutron/neutron-server/Dockerfile +++ b/docker/neutron/neutron-server/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-neutron-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-neutron-base MAINTAINER Kolla Project (https://launchpad.net/kolla) #Install required packages diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile index 22cb28bd9..b20bd4547 100644 --- a/docker/nova-controller/nova-api/Dockerfile +++ b/docker/nova-controller/nova-api/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/nova-controller/nova-conductor/Dockerfile index 958b682b8..4d7502d41 100644 --- a/docker/nova-controller/nova-conductor/Dockerfile +++ b/docker/nova-controller/nova-conductor/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/nova-controller/nova-scheduler/Dockerfile index 8a44cbe6e..14b49ba0a 100644 --- a/docker/nova-controller/nova-scheduler/Dockerfile +++ b/docker/nova-controller/nova-scheduler/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-base:l3_ovs_wip +FROM kollaglue/fedora-rdo-nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ -- cgit v1.2.3