This is an automated email from the ASF dual-hosted git repository.
marcoabreu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 462c3c3 Fixes for CI #11214 (#11217)
462c3c3 is described below
commit 462c3c35984954ef2a6e695b27e0e73058ba4009
Author: Pedro Larroy <928489+lar...@users.noreply.github.com>
AuthorDate: Sun Jun 10 02:03:32 2018 +0200
Fixes for CI #11214 (#11217)
---
ci/build.py | 2 +-
ci/docker/Dockerfile.build.android_arm64 | 2 +-
ci/docker/Dockerfile.build.android_armv7 | 2 +-
ci/docker/install/ubuntu_ccache.sh | 4 ++++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ci/build.py b/ci/build.py
index c7e8431..4473f54 100755
--- a/ci/build.py
+++ b/ci/build.py
@@ -183,7 +183,7 @@ def load_docker_cache(tag, docker_registry) -> None:
if docker_registry:
try:
import docker_cache
- logging.info('Docker cache download is enabled')
+ logging.info('Docker cache download is enabled from registry %s',
docker_registry)
docker_cache.load_docker_cache(registry=docker_registry,
docker_tag=tag)
except Exception:
logging.exception('Unable to retrieve Docker cache. Continue
without...')
diff --git a/ci/docker/Dockerfile.build.android_arm64
b/ci/docker/Dockerfile.build.android_arm64
index 44d3692..4bd4fd3 100755
--- a/ci/docker/Dockerfile.build.android_arm64
+++ b/ci/docker/Dockerfile.build.android_arm64
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARM64/ARMv8
-FROM ccache/build.ubuntu as ccachebuilder
+FROM ubuntu:16.04 as ccachebuilder
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
diff --git a/ci/docker/Dockerfile.build.android_armv7
b/ci/docker/Dockerfile.build.android_armv7
index 28dc3fd..70bb9fb 100755
--- a/ci/docker/Dockerfile.build.android_armv7
+++ b/ci/docker/Dockerfile.build.android_armv7
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARMv7
-FROM ccache/build.ubuntu as ccachebuilder
+FROM ubuntu:16.04 as ccachebuilder
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
diff --git a/ci/docker/install/ubuntu_ccache.sh
b/ci/docker/install/ubuntu_ccache.sh
index 09838d2..f5102e3 100755
--- a/ci/docker/install/ubuntu_ccache.sh
+++ b/ci/docker/install/ubuntu_ccache.sh
@@ -38,6 +38,10 @@ cd ccache
./autogen.sh
./configure
+
+# Don't build documentation #11214
+#perl -pi -e 's!\s+\Q$(installcmd) -d $(DESTDIR)$(mandir)/man1\E!!g' Makefile
+#perl -pi -e 's!\s+\Q-$(installcmd) -m 644 ccache.1
$(DESTDIR)$(mandir)/man1/\E!!g' Makefile
make -j$(nproc)
make install
--
To stop receiving notification emails like this one, please contact
marcoab...@apache.org.
