Browse Source

Make Debian repo urls configurable

Change-Id: I10d95637b56e9f70329570504500bed893016585
Depends-On: Ib43889dcec99c515b9932de381cf3ef25fbc7ff9
Yuriy Taraday 2 years ago
parent
commit
fa3bf043eb

+ 1
- 1
docker/base/Dockerfile.j2 View File

@@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
4 4
 # This will prevent questions from being asked during the install
5 5
 ENV DEBIAN_FRONTEND noninteractive
6 6
 
7
-COPY sources.list.debian /etc/apt/sources.list
7
+COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list
8 8
 COPY apt_conf_retries /etc/apt/apt.conf.d/99retries
9 9
 
10 10
 RUN apt-get update \

+ 0
- 11
docker/base/sources.list.debian View File

@@ -1,11 +0,0 @@
1
-# Default repos
2
-deb http://httpredir.debian.org/debian jessie main
3
-
4
-# jessie-backports
5
-deb http://httpredir.debian.org/debian jessie-backports main contrib
6
-
7
-# jessie-updates, previously known as 'volatile'
8
-deb http://httpredir.debian.org/debian jessie-updates main
9
-
10
-# debian security updates
11
-deb http://security.debian.org jessie/updates main

+ 11
- 0
docker/base/sources.list.debian.j2 View File

@@ -0,0 +1,11 @@
1
+# Default repos
2
+deb {{ url.debian }} jessie main
3
+
4
+# jessie-backports
5
+deb {{ url.debian }} jessie-backports main contrib
6
+
7
+# jessie-updates, previously known as 'volatile'
8
+deb {{ url.debian }} jessie-updates main
9
+
10
+# debian security updates
11
+deb {{ url.debian_security }} jessie/updates main

+ 3
- 0
service/files/defaults.yaml View File

@@ -0,0 +1,3 @@
1
+url:
2
+  debian: http://httpredir.debian.org/debian
3
+  debian_security: http://security.debian.org

Loading…
Cancel
Save