Kir Kolyshkin
dd4630ca9c
When running 'make all' on armhf, I got this: > ---> Making bundle: .integration-daemon-start (in bundles/17.06.0-dev/test-docker-py) > Using test binary docker > INFO: Waiting for daemon to start... > Starting dockerd > . > Traceback (most recent call last): > File "/usr/local/lib/python2.7/dist-packages/_pytest/config.py", line > 320, in _importconftest > mod = conftestpath.pyimport() > File "/usr/local/lib/python2.7/dist-packages/py/_path/local.py", line > 662, in pyimport > __import__(modname) > File "/docker-py/tests/integration/conftest.py", line 6, in <module> > import docker.errors > File "/docker-py/docker/__init__.py", line 2, in <module> > from .api import APIClient > File "/docker-py/docker/api/__init__.py", line 2, in <module> > from .client import APIClient > File "/docker-py/docker/api/client.py", line 11, in <module> > from .build import BuildApiMixin > File "/docker-py/docker/api/build.py", line 6, in <module> > from .. import auth > File "/docker-py/docker/auth.py", line 6, in <module> > import dockerpycreds > ImportError: No module named dockerpycreds > ERROR: could not load /docker-py/tests/integration/conftest.py The fix for this was already provided by commit 0ec8f56a3 and commit c7c923594, but for some reason it did not made its way to Dockerfiles for all architectures. While at it, remove excessive comments. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Upstream-commit: 7439d360fd567e063b8e9c4174a5c21b9fbc06aa Component: engine