You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ma...@apache.org on 2018/08/21 13:58:45 UTC
[incubator-mxnet] branch master updated: [MXNET-848] Pin dockcross
base images in CI (#12270)
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 1abe632 [MXNET-848] Pin dockcross base images in CI (#12270)
1abe632 is described below
commit 1abe632ea8e25355369dc1935441feb4c9319388
Author: Kellen Sunderland <ke...@gmail.com>
AuthorDate: Tue Aug 21 15:58:34 2018 +0200
[MXNET-848] Pin dockcross base images in CI (#12270)
Pin dockcross images to known working versions to avoid CI PR failures.
---
ci/docker/Dockerfile.build.android_armv7 | 2 +-
ci/docker/Dockerfile.build.android_armv8 | 2 +-
ci/docker/Dockerfile.build.armv6 | 2 +-
ci/docker/Dockerfile.build.armv8 | 2 --
ci/docker/Dockerfile.build.jetson | 3 ---
5 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.build.android_armv7
index f5a8d09..799e29c 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 dockcross/base:latest
+FROM mxnetci/dockcross-linux-base:08212018
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
# The cross-compiling emulator
diff --git a/ci/docker/Dockerfile.build.android_armv8 b/ci/docker/Dockerfile.build.android_armv8
index d992441..2c2c71c 100755
--- a/ci/docker/Dockerfile.build.android_armv8
+++ b/ci/docker/Dockerfile.build.android_armv8
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARM64/ARMv8
-FROM dockcross/base:latest
+FROM mxnetci/dockcross-linux-base:08212018
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
RUN apt-get update && apt-get install -y \
diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.build.armv6
index 156c57d..78071fa 100755
--- a/ci/docker/Dockerfile.build.armv6
+++ b/ci/docker/Dockerfile.build.armv6
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for ARMv6
-FROM dockcross/linux-armv6
+FROM mxnetci/dockcross-linux-armv6:08212018
ENV ARCH armv6l
ENV HOSTCC gcc
diff --git a/ci/docker/Dockerfile.build.armv8 b/ci/docker/Dockerfile.build.armv8
index 458b62e..8818ba4 100755
--- a/ci/docker/Dockerfile.build.armv8
+++ b/ci/docker/Dockerfile.build.armv8
@@ -18,8 +18,6 @@
#
# Dockerfile to build MXNet for ARM64/ARMv8
-# Temporary fix due to https://github.com/apache/incubator-mxnet/issues/10837
-#FROM dockcross/linux-arm64
FROM mxnetci/dockcross-linux-arm64:05082018
ENV ARCH aarch64
diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson
index cfb5a3f..4be011a 100755
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -22,9 +22,6 @@
FROM nvidia/cuda:9.0-cudnn7-devel as cudabuilder
-
-# Temporary fix due to https://github.com/apache/incubator-mxnet/issues/10837
-# FROM dockcross/linux-arm64
FROM mxnetci/dockcross-linux-arm64:05082018
ENV ARCH aarch64