diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-30 09:49:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-30 09:49:35 +0000 |
| commit | 47383f37c548f67dddb6dab0aec611c7cfa1f3ba (patch) | |
| tree | 33f65d51959e1c322828873681b37529e96d6da3 /docker/base | |
| parent | 9bac659f30fedc64031b8e0964f2e44a9c1cbd70 (diff) | |
| parent | 63a7d01639e9a48c20ae1ae368cfafad7ac6cd87 (diff) | |
| download | kolla-47383f37c548f67dddb6dab0aec611c7cfa1f3ba.tar.gz kolla-47383f37c548f67dddb6dab0aec611c7cfa1f3ba.zip | |
Merge "Ceph container"
Diffstat (limited to 'docker/base')
| -rwxr-xr-x | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/sources.list | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b2c19198a..3e8d6abdf 100755 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -183,6 +183,7 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com F78372A06FF50C80464FC1B4F7B8CEA6056E8E56 \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 7D5C473EB80C00FC133071068A6844A29F68104E \ + && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 7F6C9F236D170493FCF404F27EBFDD5D17ED316D \ && apt-get update \ && apt-get upgrade -y \ && apt-get dist-upgrade -y \ diff --git a/docker/base/sources.list b/docker/base/sources.list index ccb6f8d25..e6b6a8503 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -20,3 +20,6 @@ deb http://repo.percona.com/apt trusty main # RabbitMQ repo. Despite the name, the 'testing' repo is the stable repo. deb http://www.rabbitmq.com/debian/ testing main + +# Ceph repo +deb http://ceph.com/debian-hammer/ trusty main |