Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
| ... | ... |
@@ -47,8 +47,9 @@ RUN apt-get update && apt-get install -y \ |
| 47 | 47 |
python-dev \ |
| 48 | 48 |
python-mock \ |
| 49 | 49 |
python-pip \ |
| 50 |
+ python-setuptools \ |
|
| 50 | 51 |
python-websocket \ |
| 51 |
- gccgo \ |
|
| 52 |
+ golang-go \ |
|
| 52 | 53 |
iproute2 \ |
| 53 | 54 |
iputils-ping \ |
| 54 | 55 |
vim-common \ |
| ... | ... |
@@ -93,8 +94,8 @@ RUN set -x \ |
| 93 | 93 |
&& rm -rf "$SECCOMP_PATH" |
| 94 | 94 |
|
| 95 | 95 |
# Install Go |
| 96 |
-# We don't have official binary tarballs for ARM64, eigher for Go or bootstrap, |
|
| 97 |
-# so we use gccgo as bootstrap to build Go from source code. |
|
| 96 |
+# We don't have official binary golang 1.7.5 tarballs for ARM64, eigher for Go or |
|
| 97 |
+# bootstrap, so we use golang-go (1.6) as bootstrap to build Go from source code. |
|
| 98 | 98 |
# We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because |
| 99 | 99 |
# not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8. |
| 100 | 100 |
ENV GO_VERSION 1.7.5 |
| ... | ... |
@@ -145,6 +146,7 @@ ENV DOCKER_PY_COMMIT e2655f658408f9ad1f62abdef3eb6ed43c0cf324 |
| 145 | 145 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 146 | 146 |
&& cd /docker-py \ |
| 147 | 147 |
&& git checkout -q $DOCKER_PY_COMMIT \ |
| 148 |
+ && pip install wheel \ |
|
| 148 | 149 |
&& pip install -r test-requirements.txt |
| 149 | 150 |
|
| 150 | 151 |
# Install yamllint for validating swagger.yaml |