From 372dfb59a1b2110c36588a023145dbf33cf09edc Mon Sep 17 00:00:00 2001
From: Aleksandr Mogylchenko <amogylchenko@mirantis.com>
Date: Thu, 8 Sep 2016 22:19:15 +0200
Subject: [PATCH] Add digital ocean repo for mariadb

This image used to depending on base image to provide MariaDB repository and
apropriate pinning. Moving repositories to the image itself makes the
repository more self-contained, and simplifies replacing MariaDB if needed.

Change-Id: I04e8a22a44ba3e8945e59ddc5dbf3f42aff9174a
Depends-On: I3861ce9f87d123d567d1cfc0a8c41fac49c72aa3
---
 docker/mariadb/Dockerfile.j2          |  6 +++++-
 docker/mariadb/apt_preferences.debian |  3 +++
 docker/mariadb/sources.list.debian    | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 docker/mariadb/apt_preferences.debian
 create mode 100644 docker/mariadb/sources.list.debian

diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 2fe5415..a3214d4 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -1,7 +1,11 @@
 FROM {{ namespace }}/base-tools:{{ tag }}
 MAINTAINER {{ maintainer }}
 
-RUN apt-get install -y --no-install-recommends \
+COPY sources.list.debian /etc/apt/sources.list.d/mariadb.list
+COPY apt_preferences.debian /etc/apt/preferences
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
+RUN apt-get update && \
+       apt-get install -y --no-install-recommends \
         mariadb-server-10.1 \
         percona-xtrabackup \
         socat \
diff --git a/docker/mariadb/apt_preferences.debian b/docker/mariadb/apt_preferences.debian
new file mode 100644
index 0000000..e847cee
--- /dev/null
+++ b/docker/mariadb/apt_preferences.debian
@@ -0,0 +1,3 @@
+Package: *
+Pin: origin "lon1.mirrors.digitalocean.com"
+Pin-Priority: 500
diff --git a/docker/mariadb/sources.list.debian b/docker/mariadb/sources.list.debian
new file mode 100644
index 0000000..aae9ac2
--- /dev/null
+++ b/docker/mariadb/sources.list.debian
@@ -0,0 +1,14 @@
+# Default repos
+deb http://httpredir.debian.org/debian jessie main
+
+# jessie-backports
+deb http://httpredir.debian.org/debian jessie-backports main contrib
+
+# jessie-updates, previously known as 'volatile'
+deb http://httpredir.debian.org/debian jessie-updates main
+
+# debian security updates
+deb http://security.debian.org jessie/updates main
+
+# Maria DB repo
+deb [arch=amd64,i386] http://lon1.mirrors.digitalocean.com/mariadb/repo/10.1/debian jessie main