diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-17 14:12:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-17 14:12:55 +0000 |
| commit | 28aef69c6e41fdf4e0efec17b85b3adf097f069a (patch) | |
| tree | f3bee9babfff7eced8e749ad51d6b2be74d2f02b | |
| parent | cc2821c12d878517e31de444863c43abba5c421d (diff) | |
| parent | 518e72484599defe3fa6d0d749558137c47543c1 (diff) | |
| download | kolla-28aef69c6e41fdf4e0efec17b85b3adf097f069a.tar.gz kolla-28aef69c6e41fdf4e0efec17b85b3adf097f069a.zip | |
Merge "Remove nova-base since there is only 1 image for nova-compute"
| -rw-r--r-- | docker/nova-compute/nova-base/Dockerfile | 5 | ||||
| l--------- | docker/nova-compute/nova-base/build | 1 | ||||
| -rw-r--r-- | docker/nova-compute/nova-compute/Dockerfile | 2 |
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 |