From 4782a6a2af9cfc66e11f003b298a1e43f3886c61 Mon Sep 17 00:00:00 2001
From: Liu Jiaming <storypku@gmail.com>
Date: Tue, 26 May 2020 06:47:57 -0700
Subject: [PATCH] Docker: docker_start_user.sh for cyber.aarch64

---
 docker/scripts/cyber_start.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/scripts/cyber_start.sh b/docker/scripts/cyber_start.sh
index 274d636a03..ef9be66107 100755
--- a/docker/scripts/cyber_start.sh
+++ b/docker/scripts/cyber_start.sh
@@ -21,7 +21,7 @@ source "${APOLLO_ROOT_DIR}/scripts/apollo.bashrc"
 # CACHE_ROOT_DIR="${APOLLO_ROOT_DIR}/.cache"
 
 VERSION_X86_64="cyber-x86_64-18.04-20200525_0253"
-VERSION_AARCH64="cyber-aarch64-18.04-20190621_1606"
+VERSION_AARCH64="cyber-aarch64-18.04-20200525_0656"
 VERSION_LOCAL_CYBER="local_cyber_dev"
 CYBER_CONTAINER="apollo_cyber_${USER}"
 CYBER_INSIDE="in_cyber_docker"
@@ -456,12 +456,11 @@ function start_cyber_container() {
 }
 
 function after_run_setup() {
-    if [[ "${TARGET_ARCH}" == "x86_64" ]]; then
-        if [[ "${USER}" != "root" ]]; then
-            docker exec -u root "${CYBER_CONTAINER}" \
-                bash -c '/apollo/scripts/docker_start_user.sh'
-        fi
-    else
+    if [[ "${USER}" != "root" ]]; then
+        docker exec -u root "${CYBER_CONTAINER}" \
+            bash -c '/apollo/scripts/docker_start_user.sh'
+    fi
+    if [[ "${TARGET_ARCH}" == "aarch64" ]]; then
         warning "!!! Due to problem with 'docker exec' on Drive PX2 platform," \
                 "please run '/apollo/scripts/docker_start_user.sh' the first" \
                 "time you login into cyber docker !!!"
-- 
GitLab