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/11/15 22:08:32 UTC
[incubator-mxnet] branch v1.3.x updated: Add apt update to all
docker install scripts (#13287)
This is an automated email from the ASF dual-hosted git repository.
marcoabreu pushed a commit to branch v1.3.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.3.x by this push:
new 19c5016 Add apt update to all docker install scripts (#13287)
19c5016 is described below
commit 19c501680183237d52a862e6ae1dc4ddc296305b
Author: Marco de Abreu <ma...@users.noreply.github.com>
AuthorDate: Thu Nov 15 23:08:20 2018 +0100
Add apt update to all docker install scripts (#13287)
---
ci/docker/install/ubuntu_caffe.sh | 1 +
ci/docker/install/ubuntu_clang.sh | 2 +-
ci/docker/install/ubuntu_core.sh | 2 +-
ci/docker/install/ubuntu_docs.sh | 1 +
ci/docker/install/ubuntu_emscripten.sh | 1 +
ci/docker/install/ubuntu_llvm.sh | 3 ++-
ci/docker/install/ubuntu_nightly_tests.sh | 2 +-
ci/docker/install/ubuntu_npm_blc.sh | 2 +-
ci/docker/install/ubuntu_nvidia.sh | 3 ++-
ci/docker/install/ubuntu_onnx.sh | 1 +
ci/docker/install/ubuntu_perl.sh | 1 +
ci/docker/install/ubuntu_python.sh | 1 +
ci/docker/install/ubuntu_r.sh | 2 +-
ci/docker/install/ubuntu_rat.sh | 2 +-
ci/docker/install/ubuntu_scala.sh | 6 ++++--
ci/docker/install/ubuntu_tutorials.sh | 1 +
16 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/ci/docker/install/ubuntu_caffe.sh b/ci/docker/install/ubuntu_caffe.sh
index 8c13612..eaa8ab9 100755
--- a/ci/docker/install/ubuntu_caffe.sh
+++ b/ci/docker/install/ubuntu_caffe.sh
@@ -18,6 +18,7 @@
# under the License.
set -ex
+apt-get update || true
apt-get install -y \
libgflags-dev \
libgoogle-glog-dev \
diff --git a/ci/docker/install/ubuntu_clang.sh b/ci/docker/install/ubuntu_clang.sh
index 4076171..1beff7f 100755
--- a/ci/docker/install/ubuntu_clang.sh
+++ b/ci/docker/install/ubuntu_clang.sh
@@ -22,10 +22,10 @@
set -ex
# Install clang 3.9 (the same version as in XCode 8.*) and 6.0 (latest major release)
+apt-get update || true
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main" && \
apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" && \
- apt-get update && \
apt-get install -y clang-3.9 clang-6.0 && \
clang-3.9 --version && \
clang-6.0 --version
diff --git a/ci/docker/install/ubuntu_core.sh b/ci/docker/install/ubuntu_core.sh
index 8a2ea30..64f8af3 100755
--- a/ci/docker/install/ubuntu_core.sh
+++ b/ci/docker/install/ubuntu_core.sh
@@ -21,7 +21,7 @@
# the whole docker cache for the image
set -ex
-apt-get update
+apt-get update || true
apt-get install -y \
apt-transport-https \
build-essential \
diff --git a/ci/docker/install/ubuntu_docs.sh b/ci/docker/install/ubuntu_docs.sh
index a709b3d..5dc201c 100755
--- a/ci/docker/install/ubuntu_docs.sh
+++ b/ci/docker/install/ubuntu_docs.sh
@@ -23,6 +23,7 @@
set -ex
# Install dependencies
echo 'Installing dependencies...'
+apt-get update || true
apt-get install -y \
doxygen \
pandoc
diff --git a/ci/docker/install/ubuntu_emscripten.sh b/ci/docker/install/ubuntu_emscripten.sh
index e3d72ca..28ede75 100755
--- a/ci/docker/install/ubuntu_emscripten.sh
+++ b/ci/docker/install/ubuntu_emscripten.sh
@@ -25,6 +25,7 @@
set -ex
+apt-get update || true
apt-get -y install nodejs
git clone -b 1.38.6 https://github.com/kripken/emscripten.git
diff --git a/ci/docker/install/ubuntu_llvm.sh b/ci/docker/install/ubuntu_llvm.sh
index 09e13d3..f81c981 100755
--- a/ci/docker/install/ubuntu_llvm.sh
+++ b/ci/docker/install/ubuntu_llvm.sh
@@ -23,4 +23,5 @@ echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main\
>> /etc/apt/sources.list.d/llvm.list
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-apt-get update && apt-get install -y --force-yes llvm-5.0
\ No newline at end of file
+apt-get update || true
+apt-get install -y --force-yes llvm-5.0
\ No newline at end of file
diff --git a/ci/docker/install/ubuntu_nightly_tests.sh b/ci/docker/install/ubuntu_nightly_tests.sh
index 6835890..fa4f2b3 100755
--- a/ci/docker/install/ubuntu_nightly_tests.sh
+++ b/ci/docker/install/ubuntu_nightly_tests.sh
@@ -25,7 +25,7 @@ set -ex
# Adding ppas frequently fails due to busy gpg servers, retry 5 times with 5 minute delays.
for i in 1 2 3 4 5; do add-apt-repository -y ppa:ubuntu-toolchain-r/test && break || sleep 300; done
-apt-get update
+apt-get update || true
apt-get -y install time
# Install for RAT License Check Nightly Test
diff --git a/ci/docker/install/ubuntu_npm_blc.sh b/ci/docker/install/ubuntu_npm_blc.sh
index 30fcb5a..59caa9f 100755
--- a/ci/docker/install/ubuntu_npm_blc.sh
+++ b/ci/docker/install/ubuntu_npm_blc.sh
@@ -22,7 +22,7 @@
set -ex
echo 'Installing npm...'
-apt-get update
+apt-get update || true
apt-get install -y npm
echo "Obtaining NodeJS version 8.x"
diff --git a/ci/docker/install/ubuntu_nvidia.sh b/ci/docker/install/ubuntu_nvidia.sh
index 7b16ed1..df2f000 100755
--- a/ci/docker/install/ubuntu_nvidia.sh
+++ b/ci/docker/install/ubuntu_nvidia.sh
@@ -18,6 +18,7 @@
# under the License.
set -ex
+apt-get update || true
apt install -y software-properties-common
# Adding ppas frequently fails due to busy gpg servers, retry 5 times with 5 minute delays.
@@ -25,5 +26,5 @@ for i in 1 2 3 4 5; do add-apt-repository -y ppa:graphics-drivers && break || sl
# Retrieve ppa:graphics-drivers and install nvidia-drivers.
# Note: DEBIAN_FRONTEND required to skip the interactive setup steps
-apt update
+apt-get update || true
DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends cuda-9-1
diff --git a/ci/docker/install/ubuntu_onnx.sh b/ci/docker/install/ubuntu_onnx.sh
index 737c333..8ccfea5 100755
--- a/ci/docker/install/ubuntu_onnx.sh
+++ b/ci/docker/install/ubuntu_onnx.sh
@@ -27,6 +27,7 @@ set -e
set -x
echo "Installing libprotobuf-dev and protobuf-compiler ..."
+apt-get update || true
apt-get install -y libprotobuf-dev protobuf-compiler
echo "Installing pytest, pytest-cov, protobuf, Pillow, ONNX and tabulate ..."
diff --git a/ci/docker/install/ubuntu_perl.sh b/ci/docker/install/ubuntu_perl.sh
index 4d868f7..e04141e 100755
--- a/ci/docker/install/ubuntu_perl.sh
+++ b/ci/docker/install/ubuntu_perl.sh
@@ -22,5 +22,6 @@
set -ex
# install libraries for mxnet's perl package on ubuntu
+apt-get update || true
apt-get install -y libmouse-perl pdl cpanminus swig libgraphviz-perl
cpanm -q Function::Parameters Hash::Ordered PDL::CCS
diff --git a/ci/docker/install/ubuntu_python.sh b/ci/docker/install/ubuntu_python.sh
index 0fd91cb..a3878c0 100755
--- a/ci/docker/install/ubuntu_python.sh
+++ b/ci/docker/install/ubuntu_python.sh
@@ -22,6 +22,7 @@
set -ex
# install libraries for mxnet's python package on ubuntu
+apt-get update || true
apt-get install -y python-dev python3-dev virtualenv
# the version of the pip shipped with ubuntu may be too lower, install a recent version here
diff --git a/ci/docker/install/ubuntu_r.sh b/ci/docker/install/ubuntu_r.sh
index 0e95601..cefc417 100755
--- a/ci/docker/install/ubuntu_r.sh
+++ b/ci/docker/install/ubuntu_r.sh
@@ -34,7 +34,7 @@ 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-get update
+apt-get update || true
apt-get install -y --allow-unauthenticated \
libcairo2-dev \
libssl-dev \
diff --git a/ci/docker/install/ubuntu_rat.sh b/ci/docker/install/ubuntu_rat.sh
index b131a0b..2c905fc 100755
--- a/ci/docker/install/ubuntu_rat.sh
+++ b/ci/docker/install/ubuntu_rat.sh
@@ -20,7 +20,7 @@
set -ex
echo "Install dependencies"
-apt-get update
+apt-get update || true
apt-get install -y subversion maven openjdk-8-jdk openjdk-8-jre
echo "download RAT"
diff --git a/ci/docker/install/ubuntu_scala.sh b/ci/docker/install/ubuntu_scala.sh
index bee0e6b..c71c751 100755
--- a/ci/docker/install/ubuntu_scala.sh
+++ b/ci/docker/install/ubuntu_scala.sh
@@ -24,8 +24,9 @@ set -ex
cd "$(dirname "$0")"
# install libraries for mxnet's scala package on ubuntu
echo 'Installing Scala...'
+apt-get update || true
apt-get install -y software-properties-common
-apt-get update
+apt-get update || true
apt-get install -y openjdk-8-jdk
apt-get install -y openjdk-8-jre
@@ -34,7 +35,8 @@ echo "deb https://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/
#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 \
+apt-get update || true
+apt-get install -y \
maven \
sbt \
scala
diff --git a/ci/docker/install/ubuntu_tutorials.sh b/ci/docker/install/ubuntu_tutorials.sh
index 9a236bb..9877475 100755
--- a/ci/docker/install/ubuntu_tutorials.sh
+++ b/ci/docker/install/ubuntu_tutorials.sh
@@ -21,6 +21,7 @@
# the whole docker cache for the image
set -ex
+apt-get update || true
apt-get install graphviz python-opencv
pip2 install jupyter matplotlib Pillow opencv-python scikit-learn graphviz tqdm
pip3 install jupyter matplotlib Pillow opencv-python scikit-learn graphviz tqdm