You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/07/11 09:05:01 UTC
[GitHub] marcoabreu closed pull request #11602: Fix for flaky keyservers
#11601
marcoabreu closed pull request #11602: Fix for flaky keyservers #11601
URL: https://github.com/apache/incubator-mxnet/pull/11602
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/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda
index 51b398c832c..0262a100fa7 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 598b9af86ad..e715dbe39d1 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 cfc55d240c1..f010641d484 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 09d56411caa..5d021d463df 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 0cf41e5127f..0d166283819 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/export_gpg_keys.sh b/ci/docker/install/export_gpg_keys.sh
new file mode 100755
index 00000000000..604a27b9814
--- /dev/null
+++ b/ci/docker/install/export_gpg_keys.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+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 00000000000..77fd6341e9d
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 00000000000..664f01b37d0
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 7efaff88635..05e3e7cca07 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 1628e7b0a38..8890356da66 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 \
----------------------------------------------------------------
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