diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-20 10:42:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-20 10:42:07 +0000 |
| commit | 0045fd2c573b41a66f79b61b36a0b8fa606fea70 (patch) | |
| tree | 4b0a02c54cac2931aa8482e15618c9fb53314d07 /docker | |
| parent | 7a8f82aded2266be71f70fc983ad350363466a49 (diff) | |
| parent | 18a32f5e0ce0fe6551f9fd4cd42c81de76fccd0b (diff) | |
| download | kolla-0045fd2c573b41a66f79b61b36a0b8fa606fea70.tar.gz kolla-0045fd2c573b41a66f79b61b36a0b8fa606fea70.zip | |
Merge "Remove ceph as external repo"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/sources.list | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b3ad3ea91..67a0b521e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -202,7 +202,6 @@ 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 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \ - && 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 cabc777a3..bbce99219 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -15,6 +15,3 @@ 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 - -# Ceph repo -deb http://ceph.com/debian-hammer/ trusty main |