aboutsummaryrefslogtreecommitdiff
path: root/docker/ubuntu
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-04 20:00:09 +0000
committerGerrit Code Review <review@openstack.org>2015-07-04 20:00:09 +0000
commitfeb582632299bc7dd70846f1db5ecdf4645bf524 (patch)
tree3249e526c3aa350e3706d73669cd2b58193cebd3 /docker/ubuntu
parent15b60a1f8d84859c116bcaa3422902b09bcee779 (diff)
parentded326b74d9532dcc093e2aa51fedd3b04fba638 (diff)
downloadkolla-feb582632299bc7dd70846f1db5ecdf4645bf524.tar.gz
kolla-feb582632299bc7dd70846f1db5ecdf4645bf524.zip
Merge "Add base Nova image for Ubuntu"
Diffstat (limited to 'docker/ubuntu')
-rw-r--r--docker/ubuntu/binary/nova-base/Dockerfile12
l---------docker/ubuntu/binary/nova-base/build1
l---------docker/ubuntu/binary/nova-base/config-nova.sh1
3 files changed, 14 insertions, 0 deletions
diff --git a/docker/ubuntu/binary/nova-base/Dockerfile b/docker/ubuntu/binary/nova-base/Dockerfile
new file mode 100644
index 000000000..fa3df15cf
--- /dev/null
+++ b/docker/ubuntu/binary/nova-base/Dockerfile
@@ -0,0 +1,12 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN apt-get install -y --no-install-recommends \
+ nova-common \
+ python-cinderclient \
+ python-keystoneclient \
+ python-nova \
+ bridge-utils \
+ && apt-get clean
+
+COPY config-nova.sh /opt/kolla/
diff --git a/docker/ubuntu/binary/nova-base/build b/docker/ubuntu/binary/nova-base/build
new file mode 120000
index 000000000..8d652f7ee
--- /dev/null
+++ b/docker/ubuntu/binary/nova-base/build
@@ -0,0 +1 @@
+../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/ubuntu/binary/nova-base/config-nova.sh b/docker/ubuntu/binary/nova-base/config-nova.sh
new file mode 120000
index 000000000..32efe6056
--- /dev/null
+++ b/docker/ubuntu/binary/nova-base/config-nova.sh
@@ -0,0 +1 @@
+../../../common/nova-base/config-nova.sh \ No newline at end of file