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/07/11 09:05:16 UTC
[incubator-mxnet] branch master updated: Fix for flaky keyserver
keyserver.ubuntu.com. Fix #11601 (#11602)
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 4ae0cd9 Fix for flaky keyserver keyserver.ubuntu.com. Fix #11601 (#11602)
4ae0cd9 is described below
commit 4ae0cd9908d097d7cef957f5f9d5870dba7e9137
Author: Pedro Larroy <92...@users.noreply.github.com>
AuthorDate: Wed Jul 11 11:04:59 2018 +0200
Fix for flaky keyserver keyserver.ubuntu.com. Fix #11601 (#11602)
---
ci/docker/Dockerfile.build.ubuntu_build_cuda | 2 ++
ci/docker/Dockerfile.build.ubuntu_cpu | 13 ++++++++++++
ci/docker/Dockerfile.build.ubuntu_gpu | 15 ++++++++++++++
ci/docker/Dockerfile.build.ubuntu_nightly_cpu | 16 +++++++++++++-
ci/docker/Dockerfile.build.ubuntu_nightly_gpu | 16 ++++++++++++++
.../{ubuntu_scala.sh => export_gpg_keys.sh} | 23 +++++----------------
ci/docker/install/r.gpg | Bin 0 -> 1519 bytes
ci/docker/install/sbt.gpg | Bin 0 -> 2210 bytes
ci/docker/install/ubuntu_r.sh | 14 ++++++-------
ci/docker/install/ubuntu_scala.sh | 6 +++++-
10 files changed, 78 insertions(+), 27 deletions(-)
diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda
index 51b398c..0262a10 100755
--- a/ci/docker/Dockerfile.build.ubuntu_build_cuda
+++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda
@@ -32,8 +32,10 @@ RUN /work/deb_ubuntu_ccache.sh
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
COPY install/ubuntu_scala.sh /work/
+COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh
COPY install/ubuntu_r.sh /work/
+COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh
COPY install/ubuntu_perl.sh /work/
RUN /work/ubuntu_perl.sh
diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu b/ci/docker/Dockerfile.build.ubuntu_cpu
index 598b9af..e715dbe 100755
--- a/ci/docker/Dockerfile.build.ubuntu_cpu
+++ b/ci/docker/Dockerfile.build.ubuntu_cpu
@@ -24,26 +24,39 @@ WORKDIR /work/deps
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
+
COPY install/deb_ubuntu_ccache.sh /work/
RUN /work/deb_ubuntu_ccache.sh
+
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
+
COPY install/ubuntu_scala.sh /work/
+COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh
+
COPY install/ubuntu_clojure.sh /work/
RUN /work/ubuntu_clojure.sh
+
COPY install/ubuntu_r.sh /work/
+COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh
+
COPY install/ubuntu_perl.sh /work/
RUN /work/ubuntu_perl.sh
+
COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh
+
COPY install/ubuntu_mklml.sh /work/
RUN /work/ubuntu_mklml.sh
+
COPY install/ubuntu_caffe.sh /work/
RUN /work/ubuntu_caffe.sh
+
COPY install/ubuntu_onnx.sh /work/
RUN /work/ubuntu_onnx.sh
+
COPY install/ubuntu_docs.sh /work/
RUN /work/ubuntu_docs.sh
diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu b/ci/docker/Dockerfile.build.ubuntu_gpu
index cfc55d2..f010641 100755
--- a/ci/docker/Dockerfile.build.ubuntu_gpu
+++ b/ci/docker/Dockerfile.build.ubuntu_gpu
@@ -24,30 +24,45 @@ WORKDIR /work/deps
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
+
COPY install/deb_ubuntu_ccache.sh /work/
RUN /work/deb_ubuntu_ccache.sh
+
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
+
COPY install/ubuntu_scala.sh /work/
+COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh
+
COPY install/ubuntu_r.sh /work/
+COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh
+
COPY install/ubuntu_perl.sh /work/
RUN /work/ubuntu_perl.sh
+
COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh
+
COPY install/ubuntu_mklml.sh /work/
RUN /work/ubuntu_mklml.sh
+
COPY install/ubuntu_tvm.sh /work/
RUN /work/ubuntu_tvm.sh
+
COPY install/ubuntu_llvm.sh /work/
RUN /work/ubuntu_llvm.sh
+
COPY install/ubuntu_caffe.sh /work/
RUN /work/ubuntu_caffe.sh
+
COPY install/ubuntu_onnx.sh /work/
RUN /work/ubuntu_onnx.sh
+
COPY install/ubuntu_docs.sh /work/
RUN /work/ubuntu_docs.sh
+
COPY install/ubuntu_tutorials.sh /work/
RUN /work/ubuntu_tutorials.sh
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
index 09d5641..5d021d4 100755
--- a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
+++ b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
@@ -24,28 +24,42 @@ WORKDIR /work/deps
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
+
COPY install/deb_ubuntu_ccache.sh /work/
RUN /work/deb_ubuntu_ccache.sh
+
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
+
COPY install/ubuntu_scala.sh /work/
+COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh
+
COPY install/ubuntu_r.sh /work/
RUN /work/ubuntu_r.sh
+
+COPY install/r.gpg /work/
COPY install/ubuntu_perl.sh /work/
RUN /work/ubuntu_perl.sh
+
COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh
+
COPY install/ubuntu_mklml.sh /work/
RUN /work/ubuntu_mklml.sh
+
COPY install/ubuntu_caffe.sh /work/
RUN /work/ubuntu_caffe.sh
+
COPY install/ubuntu_onnx.sh /work/
RUN /work/ubuntu_onnx.sh
+
COPY install/ubuntu_docs.sh /work/
RUN /work/ubuntu_docs.sh
+
COPY install/ubuntu_nightly_tests.sh /work/
RUN /work/ubuntu_nightly_tests.sh
+
COPY install/ubuntu_emscripten.sh /work/
RUN /work/ubuntu_emscripten.sh
@@ -58,4 +72,4 @@ COPY runtime_functions.sh /work/
WORKDIR /work/mxnet
ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-ENV LLVM=/work/deps/emscripten-fastcomp/build/bin
\ No newline at end of file
+ENV LLVM=/work/deps/emscripten-fastcomp/build/bin
diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
index 0cf41e5..0d16628 100755
--- a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
+++ b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
@@ -24,32 +24,48 @@ WORKDIR /work/deps
COPY install/ubuntu_core.sh /work/
RUN /work/ubuntu_core.sh
+
COPY install/deb_ubuntu_ccache.sh /work/
RUN /work/deb_ubuntu_ccache.sh
+
COPY install/ubuntu_python.sh /work/
RUN /work/ubuntu_python.sh
+
COPY install/ubuntu_scala.sh /work/
+COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh
+
COPY install/ubuntu_r.sh /work/
+COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh
+
COPY install/ubuntu_perl.sh /work/
RUN /work/ubuntu_perl.sh
+
COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh
+
COPY install/ubuntu_mklml.sh /work/
RUN /work/ubuntu_mklml.sh
+
COPY install/ubuntu_tvm.sh /work/
RUN /work/ubuntu_tvm.sh
+
COPY install/ubuntu_llvm.sh /work/
RUN /work/ubuntu_llvm.sh
+
COPY install/ubuntu_caffe.sh /work/
RUN /work/ubuntu_caffe.sh
+
COPY install/ubuntu_onnx.sh /work/
RUN /work/ubuntu_onnx.sh
+
COPY install/ubuntu_docs.sh /work/
RUN /work/ubuntu_docs.sh
+
COPY install/ubuntu_tutorials.sh /work/
RUN /work/ubuntu_tutorials.sh
+
COPY install/ubuntu_nightly_tests.sh /work/
RUN /work/ubuntu_nightly_tests.sh
diff --git a/ci/docker/install/ubuntu_scala.sh b/ci/docker/install/export_gpg_keys.sh
similarity index 56%
copy from ci/docker/install/ubuntu_scala.sh
copy to ci/docker/install/export_gpg_keys.sh
index 1628e7b..604a27b 100755
--- a/ci/docker/install/ubuntu_scala.sh
+++ b/ci/docker/install/export_gpg_keys.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,20 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-# build and install are separated so changes to build don't invalidate
-# the whole docker cache for the image
-
-set -ex
-# install libraries for mxnet's scala package on ubuntu
-echo 'Installing Scala...'
-apt-get install -y software-properties-common
-apt-get update
-apt-get install -y openjdk-8-jdk
-apt-get install -y openjdk-8-jre
-
-echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
-apt-get update && apt-get install -y \
- maven \
- sbt \
- scala
+gpg --keyserver keyserver.ubuntu.com --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
+gpg --output sbt.gpg --export scalasbt@gmail.com
+gpg --keyserver keyserver.ubuntu.com --recv E084DAB9
+gpg --output r.gpg --export marutter@gmail.com
diff --git a/ci/docker/install/r.gpg b/ci/docker/install/r.gpg
new file mode 100644
index 0000000..77fd634
Binary files /dev/null and b/ci/docker/install/r.gpg differ
diff --git a/ci/docker/install/sbt.gpg b/ci/docker/install/sbt.gpg
new file mode 100644
index 0000000..664f01b
Binary files /dev/null and b/ci/docker/install/sbt.gpg differ
diff --git a/ci/docker/install/ubuntu_r.sh b/ci/docker/install/ubuntu_r.sh
index 7efaff8..05e3e7c 100755
--- a/ci/docker/install/ubuntu_r.sh
+++ b/ci/docker/install/ubuntu_r.sh
@@ -21,16 +21,16 @@
# the whole docker cache for the image
set -ex
+cd "$(dirname "$0")"
# install libraries for mxnet's r package on ubuntu
echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources.list
-key=E084DAB9
-
-gpg --keyserver keyserver.ubuntu.com --recv-key $key || \
- gpg --keyserver keyserver.pgp.com --recv-keys $key || \
- gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $key ;
-
-gpg -a --export $key | apt-key add -
+#key=E084DAB9
+#gpg --keyserver keyserver.ubuntu.com --recv-key $key || \
+# gpg --keyserver keyserver.pgp.com --recv-keys $key || \
+# gpg --keyserver ha.pool.sks-keyservers.net --recv-keys $key ;
+#gpg -a --export $key | apt-key add -
+apt-key add r.gpg
apt-get update
apt-get install -y --allow-unauthenticated r-base r-base-dev libxml2-dev libssl-dev libxt-dev
diff --git a/ci/docker/install/ubuntu_scala.sh b/ci/docker/install/ubuntu_scala.sh
index 1628e7b..8890356 100755
--- a/ci/docker/install/ubuntu_scala.sh
+++ b/ci/docker/install/ubuntu_scala.sh
@@ -21,6 +21,7 @@
# the whole docker cache for the image
set -ex
+cd "$(dirname "$0")"
# install libraries for mxnet's scala package on ubuntu
echo 'Installing Scala...'
apt-get install -y software-properties-common
@@ -29,7 +30,10 @@ apt-get install -y openjdk-8-jdk
apt-get install -y openjdk-8-jre
echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
+# ubuntu keyserver is very flaky
+#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
+#apt-key adv --keyserver keys.gnupg.net --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
+apt-key add sbt.gpg
apt-get update && apt-get install -y \
maven \
sbt \