From 18a32f5e0ce0fe6551f9fd4cd42c81de76fccd0b Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Sat, 19 Sep 2015 05:37:41 +0000
Subject: [PATCH] Remove ceph as external repo
* The cloud-archive now provides the most recent version of Ceph
(hammer) and should be preferred over adding a new repo.
* The ceph signing key changed.[1]
[1] https://securityblog.redhat.com/2015/09/17/important-security-notice-regarding-signing-key-and-distribution-of-red-hat-ceph-storage-on-ubuntu-and-centos/
Change-Id: I5992184f115106a9c853d205d7d79c35e1b0cf27
Closes-Bug: #1497507
---
docker/base/Dockerfile.j2 | 1 -
docker/base/sources.list | 3 ---
2 files changed, 4 deletions(-)
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 61a3f97331..8f580e4f86 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -198,7 +198,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 cabc777a3c..bbce99219f 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