From 190ae5957c69730588d6067f6490850340f219e0 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Thu, 24 Mar 2016 23:45:58 +0100
Subject: Make container dind unpin old docker relase

- remove pinning to old docker version in ubuntu
- move docker ubuntu repository to base image

Change-Id: If05ccc0c5b3e89725acea3b603b5ef7acbbee649
Partially-implements: blueprint build-debian
---
 docker/base/Dockerfile.j2       | 1 +
 docker/base/sources.list.ubuntu | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 4ff960d7a..3be901c43 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -212,6 +212,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
       '430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A',
       '08B73419AC32B4E966C1A330E84AC2C0460F3994',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
+      '58118E89F3A912897C070ADBF76221572C52609D',
     ] %}
 {% elif base_distro == 'debian' %}
     {% set keys = [
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index ecc71223e..c55609aba 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -24,3 +24,6 @@ deb http://packages.elastic.co/elasticsearch/2.x/debian stable main
 
 # Kibana repo
 deb http://packages.elastic.co/kibana/4.4/debian stable main
+
+# Docker repo
+deb http://apt.dockerproject.org/repo ubuntu-trusty main
-- 
cgit v1.2.3