diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-17 11:33:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-17 11:33:08 +0000 |
| commit | 1b33345fb8b16269d80e9379ad217049946c04e4 (patch) | |
| tree | f6f6637beb6b0d73fbb517eedf65d78651ebd74d /docker | |
| parent | 7b3143face9534330325f5ff387d30ebd262dae3 (diff) | |
| parent | 84ea8fbc9d7f10cd47c3c7e3d77359c630d44b2c (diff) | |
| download | kolla-1b33345fb8b16269d80e9379ad217049946c04e4.tar.gz kolla-1b33345fb8b16269d80e9379ad217049946c04e4.zip | |
Merge "Use Liberty cloudarchive repo for Ubuntu"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/sources.list | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index e9d0f9700..ceb51a94b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -189,9 +189,7 @@ COPY sources.list /etc/apt/ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \ && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 391A9AA2147192839E9DB0315EDB1B62EC4926EA \ - && 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 \ diff --git a/docker/base/sources.list b/docker/base/sources.list index e6b6a8503..cabc777a3 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -6,11 +6,9 @@ deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe m # Backports have a lower priority and must be explictly installed to be used deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse -# TODO(SamYaple): Switch this to the Liberty repo as soon as the update packages -# and actually start signing them. -# We need to add the Kilo repo for the updated packages they provide. The main +# We need to add the Liberty repo for the updated packages they provide. The main # ones are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/kilo main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main # MariaDB 10.0 repo deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main @@ -18,8 +16,5 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main # Percona repo (for xtrabackup) 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 |