From f2035bf4b2d282e8fd5344e4afddcc6f21cd7fc1 Mon Sep 17 00:00:00 2001
From: Sheng Zha <zhasheng@amazon.com>
Date: Thu, 2 Jan 2020 10:36:06 +0800
Subject: [PATCH] fix

---
 ci/docker/Dockerfile.build.ubuntu_build_cuda           | 6 +++---
 ci/docker/Dockerfile.publish.ubuntu1404_cpu            | 4 ++--
 ci/docker/Dockerfile.publish.ubuntu1404_gpu            | 4 ++--
 ci/docker/install/{ubuntu_ar.sh => ubuntu_binutils.sh} | 2 +-
 ci/docker/runtime_functions.sh                         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename ci/docker/install/{ubuntu_ar.sh => ubuntu_binutils.sh} (93%)

diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda
index ce6d0007875e..07f67d178c2c 100644
--- a/ci/docker/Dockerfile.build.ubuntu_build_cuda
+++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda
@@ -42,10 +42,10 @@ 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_ar.sh /work/
-RUN /work/ubuntu_ar.sh
+COPY install/ubuntu_binutils.sh /work/
+RUN /work/ubuntu_binutils.sh
 
-ENV CUDNN_VERSION=7.6.0.64
+ENV CUDNN_VERSION=7.6.5.32
 COPY install/ubuntu_cudnn.sh /work/
 RUN /work/ubuntu_cudnn.sh
 
diff --git a/ci/docker/Dockerfile.publish.ubuntu1404_cpu b/ci/docker/Dockerfile.publish.ubuntu1404_cpu
index 993d9d873075..8ccc41b2143c 100644
--- a/ci/docker/Dockerfile.publish.ubuntu1404_cpu
+++ b/ci/docker/Dockerfile.publish.ubuntu1404_cpu
@@ -25,8 +25,8 @@ WORKDIR /work/deps
 COPY install/ubuntu_publish.sh /work/
 RUN /work/ubuntu_publish.sh
 
-COPY install/ubuntu_ar.sh /work/
-RUN /work/ubuntu_ar.sh
+COPY install/ubuntu_binutils.sh /work/
+RUN /work/ubuntu_binutils.sh
 
 ARG USER_ID=0
 ARG GROUP_ID=0
diff --git a/ci/docker/Dockerfile.publish.ubuntu1404_gpu b/ci/docker/Dockerfile.publish.ubuntu1404_gpu
index eb214a620009..3a005cadecea 100644
--- a/ci/docker/Dockerfile.publish.ubuntu1404_gpu
+++ b/ci/docker/Dockerfile.publish.ubuntu1404_gpu
@@ -25,8 +25,8 @@ WORKDIR /work/deps
 COPY install/ubuntu_publish.sh /work/
 RUN /work/ubuntu_publish.sh
 
-COPY install/ubuntu_ar.sh /work/
-RUN /work/ubuntu_ar.sh
+COPY install/ubuntu_binutils.sh /work/
+RUN /work/ubuntu_binutils.sh
 
 ARG USER_ID=0
 ARG GROUP_ID=0
diff --git a/ci/docker/install/ubuntu_ar.sh b/ci/docker/install/ubuntu_binutils.sh
similarity index 93%
rename from ci/docker/install/ubuntu_ar.sh
rename to ci/docker/install/ubuntu_binutils.sh
index dbf6b2f3c119..51e075723c65 100755
--- a/ci/docker/install/ubuntu_ar.sh
+++ b/ci/docker/install/ubuntu_binutils.sh
@@ -35,4 +35,4 @@ tar -xvf binutils-2.27.tar.gz && cd binutils-2.27
 ./configure --prefix=/opt/binutils_other --exec-prefix=/opt/binutils_install
 make -j$(nproc)
 make install
-ln -s /opt/binutils_install/bin/ar /usr/local/bin/ar
+ls /opt/binutils_install/bin/ | xargs -I{} ln -s /opt/binutils_install/bin/{} /usr/local/bin/{}
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 328a008c07a5..335deb276b01 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -2064,7 +2064,7 @@ cd_s3_publish() {
     set -ex
     pip3 install --user awscli
     filepath=$(readlink -f wheel_build/dist/*.whl)
-    filename=$(basename $file_path)
+    filename=$(basename $filepath)
     variant=$(echo $filename | cut -d'-' -f1 | cut -d'_' -f2 -s)
     aws s3 cp --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers,full=id=43f628fab72838a4f0b929d7f1993b14411f4b0294b011261bc6bd3e950a6822 s3://apache-mxnet/dist/${variant}/${filename}
 }