aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <sdake@redhat.com>2014-10-16 15:58:35 -0700
committerSteven Dake <sdake@redhat.com>2014-10-16 23:02:53 -0700
commit518e72484599defe3fa6d0d749558137c47543c1 (patch)
tree7090f9006f418376b7465386012a708a88260bd8 /docker
parentd02543c1bc4e59d44a05d10f391a80d9b8b7ab99 (diff)
downloadkolla-518e72484599defe3fa6d0d749558137c47543c1.tar.gz
kolla-518e72484599defe3fa6d0d749558137c47543c1.zip
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
Diffstat (limited to 'docker')
-rw-r--r--docker/nova-compute/nova-base/Dockerfile5
l---------docker/nova-compute/nova-base/build1
-rw-r--r--docker/nova-compute/nova-compute/Dockerfile2
3 files changed, 1 insertions, 7 deletions
diff --git a/docker/nova-compute/nova-base/Dockerfile b/docker/nova-compute/nova-base/Dockerfile
deleted file mode 100644
index df2a3500e..000000000
--- a/docker/nova-compute/nova-base/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM kollaglue/fedora-rdo-base
-MAINTAINER Steven Dake <sdake@redhat.com>
-
-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 43944faa0..000000000
--- 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 2b519a343..1a95a60b3 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 <sdake@redhat.com>
# broken out by operation - we don't need libvirt and