diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 2bd8419..620039e 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -1,9 +1,10 @@ FROM {{ image_spec("base-tools") }} MAINTAINER {{ maintainer }} -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 +COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list.d/mariadb.list +COPY {{ render('apt_preferences.debian.j2') }} /etc/apt/preferences +RUN apt-key adv --recv-keys --keyserver {{ url.mariadb.debian.keyserver }} \ + {{ url.mariadb.debian.keyid }} RUN apt-get update && \ apt-get install -y --no-install-recommends \ mariadb-server-10.1 \ diff --git a/docker/mariadb/apt_preferences.debian b/docker/mariadb/apt_preferences.debian deleted file mode 100644 index e847cee..0000000 --- a/docker/mariadb/apt_preferences.debian +++ /dev/null @@ -1,3 +0,0 @@ -Package: * -Pin: origin "lon1.mirrors.digitalocean.com" -Pin-Priority: 500 diff --git a/docker/mariadb/apt_preferences.debian.j2 b/docker/mariadb/apt_preferences.debian.j2 new file mode 100644 index 0000000..54d43c0 --- /dev/null +++ b/docker/mariadb/apt_preferences.debian.j2 @@ -0,0 +1,3 @@ +Package: * +Pin: origin "{{ url.mariadb.debian.repo | host }}" +Pin-Priority: 500 diff --git a/docker/mariadb/sources.list.debian b/docker/mariadb/sources.list.debian deleted file mode 100644 index aae9ac2..0000000 --- a/docker/mariadb/sources.list.debian +++ /dev/null @@ -1,14 +0,0 @@ -# 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 diff --git a/docker/mariadb/sources.list.debian.j2 b/docker/mariadb/sources.list.debian.j2 new file mode 100644 index 0000000..5d4921d --- /dev/null +++ b/docker/mariadb/sources.list.debian.j2 @@ -0,0 +1,2 @@ +# Maria DB repo +deb [arch=amd64,i386] {{ url.mariadb.debian.repo }} jessie main diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml index c2ba3b9..d803850 100644 --- a/service/files/defaults.yaml +++ b/service/files/defaults.yaml @@ -5,3 +5,9 @@ configs: mariadb: port: cont: 3306 +url: + mariadb: + debian: + repo: "http://lon1.mirrors.digitalocean.com/mariadb/repo/10.1/debian" + keyserver: "hkp://keyserver.ubuntu.com:80" + keyid: "0xcbcb082a1bb943db"