mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fixed incompatibilities with latest xenial
Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
This commit is contained in:
parent
ea70c9f596
commit
47d887b33d
1 changed files with 5 additions and 3 deletions
|
@ -47,8 +47,9 @@ RUN apt-get update && apt-get install -y \
|
||||||
python-dev \
|
python-dev \
|
||||||
python-mock \
|
python-mock \
|
||||||
python-pip \
|
python-pip \
|
||||||
|
python-setuptools \
|
||||||
python-websocket \
|
python-websocket \
|
||||||
gccgo \
|
golang-go \
|
||||||
iproute2 \
|
iproute2 \
|
||||||
iputils-ping \
|
iputils-ping \
|
||||||
vim-common \
|
vim-common \
|
||||||
|
@ -93,8 +94,8 @@ RUN set -x \
|
||||||
&& rm -rf "$SECCOMP_PATH"
|
&& rm -rf "$SECCOMP_PATH"
|
||||||
|
|
||||||
# Install Go
|
# Install Go
|
||||||
# We don't have official binary tarballs for ARM64, eigher for Go or bootstrap,
|
# We don't have official binary golang 1.7.5 tarballs for ARM64, eigher for Go or
|
||||||
# so we use gccgo as bootstrap to build Go from source code.
|
# bootstrap, so we use golang-go (1.6) as bootstrap to build Go from source code.
|
||||||
# We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because
|
# We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because
|
||||||
# not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8.
|
# not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8.
|
||||||
ENV GO_VERSION 1.7.5
|
ENV GO_VERSION 1.7.5
|
||||||
|
@ -145,6 +146,7 @@ ENV DOCKER_PY_COMMIT e2655f658408f9ad1f62abdef3eb6ed43c0cf324
|
||||||
RUN git clone https://github.com/docker/docker-py.git /docker-py \
|
RUN git clone https://github.com/docker/docker-py.git /docker-py \
|
||||||
&& cd /docker-py \
|
&& cd /docker-py \
|
||||||
&& git checkout -q $DOCKER_PY_COMMIT \
|
&& git checkout -q $DOCKER_PY_COMMIT \
|
||||||
|
&& pip install wheel \
|
||||||
&& pip install -r test-requirements.txt
|
&& pip install -r test-requirements.txt
|
||||||
|
|
||||||
# Install yamllint for validating swagger.yaml
|
# Install yamllint for validating swagger.yaml
|
||||||
|
|
Loading…
Add table
Reference in a new issue