From 2f953a25e161581155ab943963f3106b4df2503c Mon Sep 17 00:00:00 2001
From: Vchanger <chenzhen126@huawei.com>
Date: Tue, 6 Jun 2023 22:39:32 +0800
Subject: [PATCH] Rename container name

---
 deploy/deploy.sh               | 24 ++++++++++++------------
 deploy/download_offline_res.sh |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index a0fc39e..099e8e7 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -483,14 +483,14 @@ function prepare_docker_gopher_conf() {
             -O /opt/gala/gopher_conf/extend_probes/stackprobe.conf --no-check-certificate
         [ $? -ne 0 ] && echo_err_exit "Failed to download gala-gopher stackprobe.conf"
     else
-        mv $LOCAL_DEPLOY_SRCDIR/gala-gopher.conf /opt/gala/gopher_conf/gala-gopher.conf
-        mv $LOCAL_DEPLOY_SRCDIR/gala-gopher-app.conf  /opt/gala/gopher_conf/gala-gopher-app.conf 
-        mv $LOCAL_DEPLOY_SRCDIR/stackprobe.conf  /opt/gala/gopher_conf/extend_probes/stackprobe.conf
+        \cp -f $LOCAL_DEPLOY_SRCDIR/gala-gopher.conf /opt/gala/gopher_conf/gala-gopher.conf
+        \cp -f $LOCAL_DEPLOY_SRCDIR/gala-gopher-app.conf  /opt/gala/gopher_conf/gala-gopher-app.conf
+        \cp -f $LOCAL_DEPLOY_SRCDIR/stackprobe.conf  /opt/gala/gopher_conf/extend_probes/stackprobe.conf
     fi
 }
 
 function deploy_gopher_docker() {
-    container_name="aops-gala-gopher"
+    container_name="gala-gopher"
     gopher_tag="gala-gopher-$(uname -m):${GOPHER_DOCKER_TAG}"
 
     if [ "$DEPLOY_TYPE" == "local" ] ; then
@@ -651,16 +651,16 @@ function deploy_ops_docker() {
     fi
 
     echo -e "\n[2] Creating gala-spider/gala-inference/gala-anteater container"
-    docker stop gala-spider-demo 2>/dev/null ; docker rm gala-spider-demo 2>/dev/null
-    docker run -d --name gala-spider-demo \
+    docker stop gala-spider 2>/dev/null ; docker rm gala-spider 2>/dev/null
+    docker run -d --name gala-spider \
         -e prometheus_server=${PROMETHEUS_ADDR} \
         -e arangodb_server=${ARANGODB_ADDR}  \
         -e kafka_server=${KAFKA_ADDR} \
         -e log_level=DEBUG --network host ${DOCKER_HUB_TAG_PREFIX}/"${spider_tag}"
     [ $? -ne 0 ] && echo_err_exit "Error: fail to run gala-spider container"
 
-    docker stop gala-inference-demo 2>/dev/null ; docker rm gala-inference-demo 2>/dev/null
-    docker run -d --name gala-inference-demo \
+    docker stop gala-inference 2>/dev/null ; docker rm gala-inference 2>/dev/null
+    docker run -d --name gala-inference \
         -e prometheus_server=${PROMETHEUS_ADDR} \
         -e arangodb_server=${ARANGODB_ADDR} \
         -e kafka_server=${KAFKA_ADDR} \
@@ -674,8 +674,8 @@ function deploy_ops_docker() {
     sed -i "/^Prometheus:/{n;s/server:.*/server: \"${ANTEATER_PROMETHEUS_IP}\"/g;}" $docker_anteater_conf
     sed -i "/^Prometheus:/{n;n;s/port:.*/port: \"${PROMETHEUS_PORT}\"/g;}" $docker_anteater_conf
 
-    docker stop gala-anteater-demo 2>/dev/null ; docker rm gala-anteater-demo 2>/dev/null
-    docker run -d --name gala-anteater-demo \
+    docker stop gala-anteater 2>/dev/null ; docker rm gala-anteater 2>/dev/null
+    docker run -d --name gala-anteater \
         -v $docker_anteater_conf:/etc/gala-anteater/config/gala-anteater.yaml \
         --network host ${DOCKER_HUB_TAG_PREFIX}/"${anteater_tag}"
     [ $? -ne 0 ] && echo_err_exit "Error: fail to run gala-anteater container"
@@ -825,7 +825,7 @@ EOF
 }
 
 function deploy_arangodb_docker() {
-    container_name="aops-arangodb"
+    container_name="gala-arangodb"
     if [ $(getconf PAGE_SIZE) -gt 4096 ] ; then
         echo_err_exit "Arangodb not supported on systems whose PAGE SIZE larger than 4096"
     fi
@@ -1058,7 +1058,7 @@ function get_grafana_datasourcesID_byName() {
 
 
 function deploy_grafana() {
-    container_name="aops-grafana"
+    container_name="gala-grafana"
 
     echo_info "======Deploying Grafana======"
 
diff --git a/deploy/download_offline_res.sh b/deploy/download_offline_res.sh
index a3cd295..6d0478e 100755
--- a/deploy/download_offline_res.sh
+++ b/deploy/download_offline_res.sh
@@ -348,7 +348,7 @@ function detect_os() {
     OS_TYPE=$(cat /etc/os-release | grep '^ID=' | awk -F '\"' '{print $2}')
     [ -z "$OS_TYPE" ] && echo_err_exit "Unsupport OS type, aborting!"
 
-    OS_VERSION=$(cat /etc/openEuler-latest | head -n1 | awk -F= '{print $2}' 2> /dev/null)
+    OS_VERSION=$(cat /etc/openEuler-latest 2>/dev/null | head -n1 | awk -F= '{print $2}' )
 
     config_remote_repo
 }
-- 
Gitee