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/dind | |
| 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/dind')
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 6 |
1 files changed, 2 insertions, 4 deletions
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 |