From 518e72484599defe3fa6d0d749558137c47543c1 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 16 Oct 2014 15:58:35 -0700 Subject: [PATCH] Remove nova-base since there is only 1 image for nova-compute Libvirt imports from fedora-rdo-base rather then nova-base, so no need in generating an extra image. Change-Id: I3ddd3aca54900686e3351de3dc11896347b14b6e --- docker/nova-compute/nova-base/Dockerfile | 5 ----- docker/nova-compute/nova-base/build | 1 - docker/nova-compute/nova-compute/Dockerfile | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 docker/nova-compute/nova-base/Dockerfile delete mode 120000 docker/nova-compute/nova-base/build diff --git a/docker/nova-compute/nova-base/Dockerfile b/docker/nova-compute/nova-base/Dockerfile deleted file mode 100644 index df2a3500e7..0000000000 --- a/docker/nova-compute/nova-base/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM kollaglue/fedora-rdo-base -MAINTAINER Steven Dake - -RUN yum -y install openstack-nova-common; yum clean all - diff --git a/docker/nova-compute/nova-base/build b/docker/nova-compute/nova-base/build deleted file mode 120000 index 43944faa00..0000000000 --- a/docker/nova-compute/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image \ No newline at end of file diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile index 2b519a3433..1a95a60b38 100644 --- a/docker/nova-compute/nova-compute/Dockerfile +++ b/docker/nova-compute/nova-compute/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-base +FROM kollaglue/fedora-rdo-base MAINTAINER Steven Dake # broken out by operation - we don't need libvirt and