[GitHub] marcoabreu closed pull request #11217: Fixes for CI #11214

[GitBox <gi...@apache.org>]

marcoabreu closed pull request #11217: Fixes for CI #11214
URL: https://github.com/apache/incubator-mxnet/pull/11217
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ci/build.py b/ci/build.py
index c7e84311263..4473f54210a 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 44d36925818..4bd4fd30922 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 28dc3fd2390..70bb9fb0eae 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 09838d20e69..f5102e3a273 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
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services