openstack/kolla
Code Issues Proposed changes

Merge "Remove ceph as external repo"

Browse Source
This commit is contained in:
Jenkins 2015-09-20 10:42:07 +00:00 committed by Gerrit Code Review
commit 0045fd2c57
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -202,7 +202,6 @@ COPY sources.list /etc/apt/
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \ 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 391A9AA2147192839E9DB0315EDB1B62EC4926EA \
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \ && 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 update \
&& apt-get upgrade -y \ && apt-get upgrade -y \
&& apt-get dist-upgrade -y \ && apt-get dist-upgrade -y \

3
docker/base/sources.list
View File

@ -15,6 +15,3 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main
# Percona repo (for xtrabackup) # Percona repo (for xtrabackup)
deb http://repo.percona.com/apt trusty main deb http://repo.percona.com/apt trusty main
# Ceph repo
deb http://ceph.com/debian-hammer/ trusty main