diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson index 93fe5e0a5b0d..e4950d2fac90 100644 --- a/ci/docker/Dockerfile.build.jetson +++ b/ci/docker/Dockerfile.build.jetson @@ -69,8 +69,14 @@ RUN aws s3 cp s3://mxnet-ci-prod-private-slave-data/nvidia/sdkm_downloads/cuda-r dpkg -i cuda-repo-cross-aarch64-10-0-local-10.0.326_1.0-1_all.deb && \ rm cuda-repo-cross-aarch64-10-0-local-10.0.326_1.0-1_all.deb && \ apt-get update && \ - apt-get install -y -f && \ - apt-get install -y cuda-cross-aarch64 cuda-cross-aarch64-10-0 && \ + apt install -y -f --allow-change-held-packages \ + /var/cuda-repo-10-0-local-10.0.326-cross-aarch64/cuda-cross-aarch64_10.0.326-1_all.deb \ + /var/cuda-repo-10-0-local-10.0.326-cross-aarch64/cuda-cross-aarch64-10-0_10.0.326-1_all.deb \ + /var/cuda-repo-10-0-local-10.0.326-410.108/cuda-toolkit-10-0_10.0.326-1_amd64.deb \ + /var/cuda-repo-10-0-local-10.0.326-410.108/cuda-libraries-dev-10-0_10.0.326-1_amd64.deb \ + /var/cuda-repo-10-0-local-10.0.326-410.108/cuda-tools-10-0_10.0.326-1_amd64.deb \ + /var/cuda-repo-10-0-local-10.0.326-410.108/cuda-cublas-dev-10-0_10.0.326-1_amd64.deb \ + /var/cuda-repo-10-0-local-10.0.326-410.108/cuda-cublas-10-0_10.0.326-1_amd64.deb && \ rm -rf /var/lib/apt/lists/* ARG USER_ID=0 diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda index 07f67d178c2c..4840d3703d12 100644 --- a/ci/docker/Dockerfile.build.ubuntu_build_cuda +++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda @@ -36,7 +36,6 @@ 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 b1eb89bb3f36..6893499d70a8 100644 --- a/ci/docker/Dockerfile.build.ubuntu_cpu +++ b/ci/docker/Dockerfile.build.ubuntu_cpu @@ -40,7 +40,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu_julia b/ci/docker/Dockerfile.build.ubuntu_cpu_julia index b1eb89bb3f36..6893499d70a8 100644 --- a/ci/docker/Dockerfile.build.ubuntu_cpu_julia +++ b/ci/docker/Dockerfile.build.ubuntu_cpu_julia @@ -40,7 +40,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu_r b/ci/docker/Dockerfile.build.ubuntu_cpu_r index 264d34cd6422..f41b651585cf 100644 --- a/ci/docker/Dockerfile.build.ubuntu_cpu_r +++ b/ci/docker/Dockerfile.build.ubuntu_cpu_r @@ -29,7 +29,6 @@ COPY install/deb_ubuntu_ccache.sh /work/ RUN /work/deb_ubuntu_ccache.sh COPY install/ubuntu_r.sh /work/ -COPY install/r.gpg /work/ RUN /work/ubuntu_r.sh # Always last diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 index 9a18e94bd40c..b792bae44a04 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 index 717a5aa47f0e..5e629757a35e 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 index 7a21e74a3b8b..52d65aaba0f4 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu80 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu80 index 83f05fddf261..c203161a0cbf 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu80 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu80 @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 index f43dc590e2cc..0e180a31eef4 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 index 3b1ea6c781ad..fe72b2e03d4e 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu index 5717df1b9130..b9c275e00919 100644 --- a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu +++ b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu index 5e812c433b43..216e96fcebb8 100644 --- a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu +++ b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu @@ -37,7 +37,6 @@ 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/ diff --git a/ci/docker/install/export_gpg_keys.sh b/ci/docker/install/export_gpg_keys.sh index 604a27b98143..a4882aff5424 100755 --- a/ci/docker/install/export_gpg_keys.sh +++ b/ci/docker/install/export_gpg_keys.sh @@ -19,5 +19,3 @@ 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 deleted file mode 100644 index 77fd6341e9d4..000000000000 Binary files a/ci/docker/install/r.gpg and /dev/null differ diff --git a/ci/docker/install/ubuntu_r.sh b/ci/docker/install/ubuntu_r.sh index b7ddea78f90a..cd5fcb821d6f 100755 --- a/ci/docker/install/ubuntu_r.sh +++ b/ci/docker/install/ubuntu_r.sh @@ -29,10 +29,7 @@ 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 -apt-key add r.gpg - -# Installing the latest version (3.3+) that is compatible with MXNet -add-apt-repository 'deb [arch=amd64,i386] https://cran.rstudio.com/bin/linux/ubuntu xenial/' +apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9 apt-get update || true apt-get install -y --allow-unauthenticated \