diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-30 20:06:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-30 20:06:59 +0000 |
| commit | 2548c67ad906ad74edd0517a14cda5ddba0fe2a3 (patch) | |
| tree | fd09ffba1462ad7989febfaa0ae0875169c0e69e /docker | |
| parent | 21668b3b9d242681eb8c4e5952df232a2a629941 (diff) | |
| parent | 7e2486c3d9edc94300a58f5e8203277fd5d7e01d (diff) | |
| download | kolla-2548c67ad906ad74edd0517a14cda5ddba0fe2a3.tar.gz kolla-2548c67ad906ad74edd0517a14cda5ddba0fe2a3.zip | |
Merge "Upgrade from docker-py to docker"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index bd85b7a63..86783be1a 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -21,7 +21,7 @@ RUN /bin/true {{ macros.install_packages(dind_packages | customizable("packages")) }} {% set dind_pip_packages = [ - 'docker-py' + 'docker' ] %} RUN {{ macros.install_pip(dind_pip_packages | customizable("pip_packages"), constraints = false) }} |