From e0c6d14332dd0a6738cde53b5fb804f24df4b88b Mon Sep 17 00:00:00 2001
From: Lei Wang <bestwanglei@gmail.com>
Date: Fri, 20 Oct 2017 14:56:56 -0700
Subject: [PATCH] Host ros package in docker and update ros build rules. (#759)

---
 WORKSPACE.in                |  5 ++---
 docker/scripts/dev_start.sh |  2 +-
 scripts/docker_adduser.sh   | 10 +++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/WORKSPACE.in b/WORKSPACE.in
index 9ef9e6cf71..fbee2e5260 100644
--- a/WORKSPACE.in
+++ b/WORKSPACE.in
@@ -76,11 +76,10 @@ new_http_archive(
 )
 
 #ros
-new_http_archive(
+new_local_repository(
     name = "ros",
     build_file = "third_party/ros.BUILD",
-    strip_prefix = "ros",
-    url = "https://github.com/ApolloAuto/apollo-platform/releases/download/1.5.1/ros-indigo-apollo-1.5.1-MACHINE_ARCH.tar.gz",
+    path = "/home/tmp/ros",
 )
 
 # OpenCV 2.4.13.2
diff --git a/docker/scripts/dev_start.sh b/docker/scripts/dev_start.sh
index 0e5650c0ec..023088a533 100755
--- a/docker/scripts/dev_start.sh
+++ b/docker/scripts/dev_start.sh
@@ -18,7 +18,7 @@
 
 VERSION=""
 ARCH=$(uname -m)
-VERSION_X86_64="dev-x86_64-20171013_1336"
+VERSION_X86_64="dev-x86_64-20171020_1159"
 VERSION_AARCH64="dev-aarch64-20170927_1111"
 if [[ $# == 1 ]];then
     VERSION=$1
diff --git a/scripts/docker_adduser.sh b/scripts/docker_adduser.sh
index 31085a9cde..b3254bd8ce 100755
--- a/scripts/docker_adduser.sh
+++ b/scripts/docker_adduser.sh
@@ -34,11 +34,19 @@ if [ -e /dev/ttyUSB0 ]; then
 fi
 
 MACHINE_ARCH=$(uname -m)
-ROS_TAR="ros-indigo-apollo-1.5.0-${MACHINE_ARCH}.tar.gz"
+ROS_TAR="ros-indigo-apollo-1.5.1-${MACHINE_ARCH}.tar.gz"
 if [ "$RELEASE_DOCKER" != "1" ];then
   # setup map data
   if [ -e /home/tmp/modules_data ]; then
     cp -r /home/tmp/modules_data/* /apollo/modules/
     chown -R ${DOCKER_USER}:${DOCKER_GRP} "/apollo/modules"
   fi
+# setup ros package
+# this is a tempary solution to avoid ros package downloading.
+ROS="/home/tmp/ros"
+if [ -e "$ROS" ]; then
+  rm -rf $ROS
+fi
+tar xzf "/home/tmp/${ROS_TAR}" -C "/home/tmp"
+chown -R ${DOCKER_USER}:${DOCKER_GRP} "${ROS}"
 fi
-- 
GitLab