Move repository address to variables url.mariadb.debian.repo

Depends-On: Ideb6323f7192814f6d0ff74a33d34329f603ecb2

Change-Id: If387d7bfa2622afe702db1f59b83f8d4a0207358
This commit is contained in:
Artur Zarzycki 2016-11-08 11:32:53 +01:00
parent b957bc5b33
commit fc8f4a4803
6 changed files with 15 additions and 20 deletions

View File

@ -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 \

View File

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

View File

@ -0,0 +1,3 @@
Package: *
Pin: origin "{{ url.mariadb.debian.repo | host }}"
Pin-Priority: 500

View File

@ -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

View File

@ -0,0 +1,2 @@
# Maria DB repo
deb [arch=amd64,i386] {{ url.mariadb.debian.repo }} jessie main

View File

@ -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"