Remove digitalocean and ceph sources from apt

We used to adding digitalocean repositories for mariadb and ceph ones for ceph,
updating pinning at the same time. This should not really be in the base image,
and at least for mariadb it conflicts with other repo providers and makes it
impossible to install Percona (for example).

Change-Id: I3861ce9f87d123d567d1cfc0a8c41fac49c72aa3
This commit is contained in:
Aleksandr Mogylchenko 2016-09-08 22:08:31 +02:00
parent a53431f6ac
commit 7947b192d6
3 changed files with 0 additions and 18 deletions

View File

@ -5,13 +5,8 @@ MAINTAINER {{ maintainer }}
ENV DEBIAN_FRONTEND noninteractive
COPY sources.list.debian /etc/apt/sources.list
COPY apt_preferences.debian /etc/apt/preferences
COPY apt_conf_retries /etc/apt/apt.conf.d/99retries
# Ceph and Mariadb keys
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 08B73419AC32B4E966C1A330E84AC2C0460F3994 \
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get dist-upgrade -y \

View File

@ -1,7 +0,0 @@
Package: *
Pin: origin "download.ceph.com"
Pin-Priority: 500
Package: *
Pin: origin "lon1.mirrors.digitalocean.com"
Pin-Priority: 500

View File

@ -9,9 +9,3 @@ deb http://httpredir.debian.org/debian jessie-updates main
# debian security updates
deb http://security.debian.org jessie/updates main
# Ceph repo
deb http://download.ceph.com/debian-hammer/ jessie main
# Maria DB repo
deb [arch=amd64,i386] http://lon1.mirrors.digitalocean.com/mariadb/repo/10.1/debian jessie main