From fa72a389b79e1e15cd94dcf67da2bef51050dabc Mon Sep 17 00:00:00 2001
From: Kellen Sunderland <kellen.sunderland@gmail.com>
Date: Mon, 10 Sep 2018 18:31:34 +0200
Subject: [PATCH] Build ASAN on without nvidia-docker

---
 Jenkinsfile | 4 ++--
 ci/build.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1c2407fd514c..011362aa88f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -166,7 +166,7 @@ core_logic: {
         ws('workspace/build-cpu-asan') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_cmake_asan', true)
+            utils.docker_run('ubuntu_cpu', 'build_ubuntu_cpu_cmake_asan', false)
             utils.pack_lib('cpu_asan', mx_lib_cpp_examples_cpu)
           }
         }
@@ -470,7 +470,7 @@ core_logic: {
       node(NODE_LINUX_CPU) {
         ws('workspace/ut-python3-cpu-asan') {
             utils.unpack_and_init('cpu_asan', mx_lib_cpp_examples_cpu)
-            utils.docker_run('ubuntu_gpu', 'integrationtest_ubuntu_gpu_cpp_package', true)
+            utils.docker_run('ubuntu_gpu', 'integrationtest_ubuntu_gpu_cpp_package', false)
         }
       }
     },
diff --git a/ci/build.py b/ci/build.py
index c73ad258f73d..a4af2bcd09b8 100755
--- a/ci/build.py
+++ b/ci/build.py
@@ -142,7 +142,6 @@ def build_docker(platform: str, docker_binary: str, registry: str, num_retries:
     #
     cmd = [docker_binary, "build",
            "-f", get_dockerfile(platform),
-           "--cap-add SYS_PTRACE", # Required by ASAN
            "--build-arg", "USER_ID={}".format(os.getuid()),
            "--build-arg", "GROUP_ID={}".format(os.getgid())]
     if use_cache:
@@ -247,6 +246,8 @@ def container_run(platform: str,
     docker_cmd_list = [
         get_docker_binary(nvidia_runtime),
         'run',
+        "--cap-add",
+        "SYS_PTRACE", # Required by ASAN
         '--rm',
         '--shm-size={}'.format(shared_memory_size),
         # mount mxnet root