mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #38524 from thaJeztah/update_docker_py
Update docker-py to 3.7.0
This commit is contained in:
commit
ef91b404ef
1 changed files with 8 additions and 2 deletions
10
Dockerfile
10
Dockerfile
|
@ -74,7 +74,7 @@ RUN set -x \
|
||||||
|
|
||||||
FROM base AS docker-py
|
FROM base AS docker-py
|
||||||
# Get the "docker-py" source so we can run their integration tests
|
# 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 \
|
RUN git clone https://github.com/docker/docker-py.git /build \
|
||||||
&& cd /build \
|
&& cd /build \
|
||||||
&& git checkout -q $DOCKER_PY_COMMIT
|
&& git checkout -q $DOCKER_PY_COMMIT
|
||||||
|
@ -184,6 +184,9 @@ RUN apt-get update && apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
libcap2-bin \
|
libcap2-bin \
|
||||||
libdevmapper-dev \
|
libdevmapper-dev \
|
||||||
|
# libffi-dev and libssl-dev appear to be required for compiling paramiko on s390x/ppc64le
|
||||||
|
libffi-dev \
|
||||||
|
libssl-dev \
|
||||||
libudev-dev \
|
libudev-dev \
|
||||||
libsystemd-dev \
|
libsystemd-dev \
|
||||||
binutils-mingw-w64 \
|
binutils-mingw-w64 \
|
||||||
|
@ -192,6 +195,8 @@ RUN apt-get update && apt-get install -y \
|
||||||
pigz \
|
pigz \
|
||||||
python-backports.ssl-match-hostname \
|
python-backports.ssl-match-hostname \
|
||||||
python-dev \
|
python-dev \
|
||||||
|
# python-cffi appears to be required for compiling paramiko on s390x/ppc64le
|
||||||
|
python-cffi \
|
||||||
python-mock \
|
python-mock \
|
||||||
python-pip \
|
python-pip \
|
||||||
python-requests \
|
python-requests \
|
||||||
|
@ -224,7 +229,8 @@ COPY --from=docker-py /build/ /docker-py
|
||||||
# split out into a separate image, including all the `python-*` deps installed
|
# split out into a separate image, including all the `python-*` deps installed
|
||||||
# above.
|
# above.
|
||||||
RUN cd /docker-py \
|
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 yamllint==1.5.0 \
|
||||||
&& pip install -r test-requirements.txt
|
&& pip install -r test-requirements.txt
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue