diff options
| author |   hongbo tian <hongbo.tianhongbo@huawei.com> | 2016-12-15 01:10:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-15 01:10:19 +0000 |
| commit | 997c96478d62ad8b2cc9ebac571e78c56c85280e (patch) | |
| tree | 433cebdefe95bd36d8cf503994a14eecafea5014 | |
| parent | 5809de2a438fcffb57d2b675e36ce1cbc0ea90f7 (diff) | |
| parent | 50c1cb7364494e1bf9ffec28b2562522ace6b3cd (diff) | |
Merge "dovetail tool: fix docker version of client mismatches with server in Docker image"
| -rw-r--r-- | docker/Dockerfile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 19dc3619..2e919ee2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,13 +13,7 @@ RUN \ apt-transport-https \ --no-install-recommends \ && \ - apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D \ -&& \ - mkdir -p /etc/apt/sources.list.d \ -&& \ - echo deb https://apt.dockerproject.org/repo ubuntu-trusty main > /etc/apt/sources.list.d/docker.list \ -&& \ - apt-get update && apt-get install -y docker-engine=1.12.3-0~trusty \ + apt-get update && apt-get -y install docker.io \ && \ pip install pyyaml \ click \ |