openstack/kolla
Code Issues Proposed changes

Merge "Make container dind unpin old docker relase"

Browse Source
This commit is contained in:
Jenkins 2016-06-06 11:55:38 +00:00 committed by Gerrit Code Review
commit f259f93f86
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -212,6 +212,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A', '430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A',
'08B73419AC32B4E966C1A330E84AC2C0460F3994', '08B73419AC32B4E966C1A330E84AC2C0460F3994',
'46095ACC8548582C1A2699A9D27D666CD88E42B4', '46095ACC8548582C1A2699A9D27D666CD88E42B4',
'58118E89F3A912897C070ADBF76221572C52609D',
] %} ] %}
{% elif base_distro == 'debian' %} {% elif base_distro == 'debian' %}
{% set keys = [ {% set keys = [

3
docker/base/sources.list.ubuntu
View File

@ -24,3 +24,6 @@ deb http://packages.elastic.co/elasticsearch/2.x/debian stable main
# Kibana repo # Kibana repo
deb http://packages.elastic.co/kibana/4.4/debian stable main deb http://packages.elastic.co/kibana/4.4/debian stable main
# Docker repo
deb http://apt.dockerproject.org/repo ubuntu-trusty main

6
docker/dind/Dockerfile.j2
View File

@ -10,12 +10,10 @@ RUN /bin/true
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo 'deb http://apt.dockerproject.org/repo ubuntu-trusty main' > /etc/apt/sources.list.d/docker.list \ RUN apt-get update \
&& apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \
&& apt-get update \
&& apt-get -y install --no-install-recommends \ && apt-get -y install --no-install-recommends \
btrfs-tools \ btrfs-tools \
docker-engine=1.8.2-0~trusty \ docker-engine \
openssh-server \ openssh-server \
&& apt-get clean \ && apt-get clean \
&& pip --no-cache-dir install --upgrade docker-py && pip --no-cache-dir install --upgrade docker-py