From 0addc7f6c542b0efced6454467c0c6bd2cd73e95 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 9 Jan 2019 22:47:33 +0100 Subject: [PATCH] Update docker-py to 3.7.0 Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c0c05affc79b199248b457af16fff61c305b7623) Signed-off-by: Sebastiaan van Stijn Upstream-commit: b92e9e9da9519efa38d8a5927af668413cf81cd7 Component: engine --- components/engine/Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index b76ae60909..15ccf0f829 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -77,7 +77,7 @@ RUN set -x \ FROM base AS docker-py # Get the "docker-py" source so we can run their integration tests -ENV DOCKER_PY_COMMIT 8b246db271a85d6541dc458838627e89c683e42f +ENV DOCKER_PY_COMMIT ac922192959870774ad8428344d9faa0555f7ba6 RUN git clone https://github.com/docker/docker-py.git /build \ && cd /build \ && git checkout -q $DOCKER_PY_COMMIT @@ -187,6 +187,9 @@ RUN apt-get update && apt-get install -y \ jq \ libcap2-bin \ libdevmapper-dev \ +# libffi-dev and libssl-dev appear to be required for compiling paramiko on s390x/ppc64le + libffi-dev \ + libssl-dev \ libudev-dev \ libsystemd-dev \ binutils-mingw-w64 \ @@ -195,6 +198,8 @@ RUN apt-get update && apt-get install -y \ pigz \ python-backports.ssl-match-hostname \ python-dev \ +# python-cffi appears to be required for compiling paramiko on s390x/ppc64le + python-cffi \ python-mock \ python-pip \ python-requests \ @@ -227,7 +232,8 @@ COPY --from=docker-py /build/ /docker-py # split out into a separate image, including all the `python-*` deps installed # above. RUN cd /docker-py \ - && pip install docker-pycreds==0.2.1 \ + && pip install docker-pycreds==0.4.0 \ + && pip install paramiko==2.4.2 \ && pip install yamllint==1.5.0 \ && pip install -r test-requirements.txt