diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-06 11:55:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-06 11:55:39 +0000 |
| commit | f259f93f86592188676703c1b9b59af2a2ad9947 (patch) | |
| tree | 38fee574b19c5a94461c965ebb856f1b8e64b13f /docker | |
| parent | 2de2cf6cd0eb22d851e94d31178d9ab84fae544f (diff) | |
| parent | 190ae5957c69730588d6067f6490850340f219e0 (diff) | |
| download | kolla-f259f93f86592188676703c1b9b59af2a2ad9947.tar.gz kolla-f259f93f86592188676703c1b9b59af2a2ad9947.zip | |
Merge "Make container dind unpin old docker relase"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 | ||||
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 6 |
3 files changed, 6 insertions, 4 deletions
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 diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 9a9f697c1..e1622aeff 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -10,12 +10,10 @@ RUN /bin/true {% elif base_distro in ['ubuntu', 'debian'] %} -RUN echo 'deb http://apt.dockerproject.org/repo ubuntu-trusty main' > /etc/apt/sources.list.d/docker.list \ - && apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \ - && apt-get update \ +RUN apt-get update \ && apt-get -y install --no-install-recommends \ btrfs-tools \ - docker-engine=1.8.2-0~trusty \ + docker-engine \ openssh-server \ && apt-get clean \ && pip --no-cache-dir install --upgrade docker-py |