1. docker
  2. Commit ce2a0120c1925492a9bb7f6339cdbf716a4c50e0
Browse code

Dockerfiles: fix test-docker-py

Presumably after switch to debian-stretch as a base, the following
errors happens in Jenkins:

10:48:03 ---> Making bundle: test-docker-py (in
bundles/17.06.0-dev/test-docker-py)
10:48:03 ---> Making bundle: .integration-daemon-start (in
bundles/17.06.0-dev/test-docker-py)
10:48:03 Using test binary docker
10:48:03 # DOCKER_EXPERIMENTAL is set: starting daemon with experimental
features enabled!
10:48:03 /etc/init.d/apparmor: 130: /etc/init.d/apparmor:
systemd-detect-virt: not found
10:48:03 Starting AppArmor profiles:Warning from stdin (line 1):
/sbin/apparmor_parser: cannot use or update cache, disable, or
force-complain via stdin
10:48:03 Warning failed to create cache: (null)
10:48:03 .
10:48:03 INFO: Waiting for daemon to start...
10:48:03 Starting dockerd
10:48:05 .
10:48:06 Traceback (most recent call last):
10:48:06 File
"/usr/local/lib/python2.7/dist-packages/_pytest/config.py", line 320, in
_importconftest
10:48:06 mod = conftestpath.pyimport()
10:48:06 File
"/usr/local/lib/python2.7/dist-packages/py/_path/local.py", line 662, in
pyimport
10:48:06 __import__(modname)
10:48:06 File "/docker-py/tests/integration/conftest.py", line 6, in
<module>
10:48:06 import docker.errors
10:48:06 File "/docker-py/docker/__init__.py", line 2, in <module>
10:48:06 from .api import APIClient
10:48:06 File "/docker-py/docker/api/__init__.py", line 2, in <module>
10:48:06 from .client import APIClient
10:48:06 File "/docker-py/docker/api/client.py", line 6, in <module>
10:48:06 import requests
10:48:06 ImportError: No module named requests
10:48:06 ERROR: could not load /docker-py/tests/integration/conftest.py
10:48:06

and

00:38:55 File "/docker-py/docker/transport/ssladapter.py", line 21, in
<module>
00:38:55 from backports.ssl_match_hostname import match_hostname
00:38:55 ImportError: No module named backports.ssl_match_hostname
00:38:55 ERROR: could not load /docker-py/tests/integration/conftest.py

To fix, install the missing python modules.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kir Kolyshkin authored on 2017/08/22 21:10:55
Showing 5 changed files
Dockerfile
History View file @ ce2a012
... ... 
@@ -63,11 +63,14 @@ RUN apt-get update && apt-get install -y \
63 63 
 	pkg-config \
64 64 
 	protobuf-compiler \
65 65 
 	protobuf-c-compiler \
66 
+	python-backports.ssl-match-hostname \
66 67 
 	python-dev \
67 68 
 	python-mock \
68 69 
 	python-pip \
70 
+	python-requests \
69 71 
 	python-setuptools \
70 72 
 	python-websocket \
73 
+	python-wheel \
71 74 
 	tar \
72 75 
 	thin-provisioning-tools \
73 76 
 	vim \
Dockerfile.aarch64
History View file @ ce2a012
... ... 
@@ -56,11 +56,14 @@ RUN apt-get update && apt-get install -y \
56 56 
 	pkg-config \
57 57 
 	protobuf-compiler \
58 58 
 	protobuf-c-compiler \
59 
+	python-backports.ssl-match-hostname \
59 60 
 	python-dev \
60 61 
 	python-mock \
61 62 
 	python-pip \
63 
+	python-requests \
62 64 
 	python-setuptools \
63 65 
 	python-websocket \
66 
+	python-wheel \
64 67 
 	tar \
65 68 
 	thin-provisioning-tools \
66 69 
 	vim \
... ... 
@@ -128,7 +131,6 @@ ENV DOCKER_PY_COMMIT a962578e515185cf06506050b2200c0b81aa84ef
128 128 
 RUN git clone https://github.com/docker/docker-py.git /docker-py \
129 129 
 	&& cd /docker-py \
130 130 
 	&& git checkout -q $DOCKER_PY_COMMIT \
131 
-	&& pip install wheel \
132 131 
 	&& pip install docker-pycreds==0.2.1 \
133 132 
 	&& pip install -r test-requirements.txt
134 133
Dockerfile.armhf
History View file @ ce2a012
... ... 
@@ -45,11 +45,14 @@ RUN apt-get update && apt-get install -y \
45 45 
 	libudev-dev \
46 46 
 	mercurial \
47 47 
 	pkg-config \
48 
+	python-backports.ssl-match-hostname \
48 49 
 	python-dev \
49 50 
 	python-mock \
50 51 
 	python-pip \
52 
+	python-requests \
51 53 
 	python-setuptools \
52 54 
 	python-websocket \
55 
+	python-wheel \
53 56 
 	xfsprogs \
54 57 
 	tar \
55 58 
 	thin-provisioning-tools \
Dockerfile.ppc64le
History View file @ ce2a012
... ... 
@@ -46,11 +46,14 @@ RUN apt-get update && apt-get install -y \
46 46 
 	libudev-dev \
47 47 
 	mercurial \
48 48 
 	pkg-config \
49 
+	python-backports.ssl-match-hostname \
49 50 
 	python-dev \
50 51 
 	python-mock \
51 52 
 	python-pip \
53 
+	python-requests \
52 54 
 	python-setuptools \
53 55 
 	python-websocket \
56 
+	python-wheel \
54 57 
 	xfsprogs \
55 58 
 	tar \
56 59 
 	thin-provisioning-tools \
Dockerfile.s390x
History View file @ ce2a012
... ... 
@@ -42,11 +42,14 @@ RUN apt-get update && apt-get install -y \
42 42 
 	libudev-dev \
43 43 
 	mercurial \
44 44 
 	pkg-config \
45 
+	python-backports.ssl-match-hostname \
45 46 
 	python-dev \
46 47 
 	python-mock \
47 48 
 	python-pip \
49 
+	python-requests \
48 50 
 	python-setuptools \
49 51 
 	python-websocket \
52 
+	python-wheel \
50 53 
 	xfsprogs \
51 54 
 	tar \
52 55 
 	thin-provisioning-tools \