Make Debian repo urls configurable

Change-Id: I10d95637b56e9f70329570504500bed893016585 Depends-On: Ib43889dcec99c515b9932de381cf3ef25fbc7ff9
2016-10-26 09:51:05 +02:00 · 2016-10-26 09:51:05 +02:00 · fa3bf043eb
parent 9654b194e5
commit fa3bf043eb
4 changed files with 15 additions and 12 deletions
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
 # This will prevent questions from being asked during the install
 ENV DEBIAN_FRONTEND noninteractive

-COPY sources.list.debian /etc/apt/sources.list
+COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list
 COPY apt_conf_retries /etc/apt/apt.conf.d/99retries

 RUN apt-get update \
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@ -1,11 +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
--- a/docker/base/sources.list.debian.j2
+++ b/docker/base/sources.list.debian.j2
@ -0,0 +1,11 @@
+# Default repos
+deb {{ url.debian }} jessie main
+
+# jessie-backports
+deb {{ url.debian }} jessie-backports main contrib
+
+# jessie-updates, previously known as 'volatile'
+deb {{ url.debian }} jessie-updates main
+
+# debian security updates
+deb {{ url.debian_security }} jessie/updates main
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@ -0,0 +1,3 @@
+url:
+  debian: http://httpredir.debian.org/debian
+  debian_security: http://security.debian.org