Point docker image to internal hub, add internal gnss config and canlibs.

apollo.sh

@@ -123,6 +123,10 @@ function apollo_build() {
     fail 'Build failed!'
   fi
   find bazel-genfiles/* -type d -exec touch "{}/__init__.py" \;
+  if [ -d "/root/conf" ];then
+    sudo cp -r /root/conf bazel-apollo/external/ros/share/gnss_driver/
+    sudo chown -R ${DOCKER_USER}:${DOCKER_GRP} "bazel-apollo/external/ros/share/gnss_driver/conf"
+  fi
 }
 
 function check() {

apollo_docker.sh

@@ -8,7 +8,7 @@ source ${DIR}/scripts/apollo_base.sh
 
 TIME=$(date  +%Y%m%d_%H%M)
 if [ -z "${DOCKER_REPO}" ]; then
-    DOCKER_REPO=apolloauto/apollo
+    DOCKER_REPO=apolloauto/internal
 fi
 
 function print_usage() {

docker/scripts/dev_create.sh

@@ -19,7 +19,7 @@
 
 TIME=$(date  +%Y%m%d_%H%M)
 if [ -z "${DOCKER_REPO}" ]; then
-    DOCKER_REPO=apolloauto/apollo
+    DOCKER_REPO=apolloauto/internal
 fi
 
 
@@ -32,4 +32,4 @@ docker build -t "${DOCKER_REPO}:${TAG}" \
     -f "${APOLLO_ROOT}/docker/dev.${ARCH}.dockerfile" \
     "${APOLLO_ROOT}"
 
-sed -i "s/dev-${ARCH}-.*\"/${TAG}\"/g" ${APOLLO_ROOT}/docker/scripts/dev_start.sh
\ No newline at end of file
+sed -i "s/dev-${ARCH}-.*\"/${TAG}\"/g" ${APOLLO_ROOT}/docker/scripts/dev_start.sh

docker/scripts/dev_start.sh

@@ -18,7 +18,7 @@
 
 VERSION=""
 ARCH=$(uname -m)
-VERSION_X86_64="dev-x86_64-20170724_1900"
+VERSION_X86_64="dev-x86_64-20170731_1713"
 VERSION_AARCH64="dev-aarch64-20170712_1533"
 if [[ $# == 1 ]];then
     VERSION=$1
@@ -32,7 +32,7 @@ else
 fi
 
 if [ -z "${DOCKER_REPO}" ]; then
-    DOCKER_REPO=apolloauto/apollo
+    DOCKER_REPO=apolloauto/internal
 fi
 
 IMG=${DOCKER_REPO}:$VERSION

docker/scripts/release_start.sh

@@ -48,7 +48,7 @@ if [[ $# == 1 ]];then
     VERSION=$1
 fi
 if [ -z "${DOCKER_REPO}" ]; then
-    DOCKER_REPO=apolloauto/apollo
+    DOCKER_REPO=apolloauto/internal
 fi
 IMG=${DOCKER_REPO}:$VERSION
 

scripts/docker_adduser.sh

@@ -25,8 +25,6 @@ echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 cp -r /etc/skel/. /home/${DOCKER_USER}
 echo 'if [ -e "/apollo/scripts/apollo_base.sh" ]; then source /apollo/scripts/apollo_base.sh; fi' >> "/home/${DOCKER_USER}/.bashrc"
 chown -R ${DOCKER_USER}:${DOCKER_GRP} "/home/${DOCKER_USER}"
-cp -r /root/modules_data/* /apollo/modules/
-chown -R ${DOCKER_USER}:${DOCKER_GRP} "/apollo/modules"
 
 # grant caros user to access GPS device
 if [ -e /dev/ttyUSB0 ]; then
@@ -41,3 +39,11 @@ fi
 if [ -e /dev/can0 ]; then
     sudo chown ${DOCKER_USER}:${DOCKER_GRP} /dev/can0
 fi
+
+#setup big data
+cp -r /root/modules_data/* /apollo/modules/
+chown -R ${DOCKER_USER}:${DOCKER_GRP} "/apollo/modules"
+#setup internal configuration
+cp -r /root/esd_can/include /apollo/third_party/can_card_library/esd_can
+cp -r /root/esd_can/lib /apollo/third_party/can_card_library/esd_can
+chown -R ${DOCKER_USER}:${DOCKER_GRP} "/apollo/third_party/can_card_library/esd_can"