diff --git "a/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\346\211\213\345\212\250\351\203\250\347\275\262.md" "b/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\346\211\213\345\212\250\351\203\250\347\275\262.md" index bfe40dd45fda3037eb87b04fe0a70a16ea6a0aa6..aaa7520574bcce0b939962ca0d35324eb20431cf 100644 --- "a/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\346\211\213\345\212\250\351\203\250\347\275\262.md" +++ "b/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\346\211\213\345\212\250\351\203\250\347\275\262.md" @@ -98,6 +98,12 @@ wget https://anolis-service-pub.oss-cn-zhangjiakou.aliyuncs.com/biz-resource/ton ### b. 设置并替换变量 执行以下脚本(需手动替换`必填的`变量): ```shell +# 获取架构 +os_arch=$(uname -m) +if [ "$os_arch" == "aarch64" ]; then + platform="linux/arm64" +else + platform="linux/amd64" # 部署机外网IP地址(必填) server_ip= @@ -124,6 +130,7 @@ sed -i "s/var_admin_urls_token/${admin_urls_token}/g" docker-compose.yaml sed -i "s/var_pub_api_token/${pub_api_token}/g" docker-compose.yaml sed -i "s/var_version_tag/${version_tag}/g" docker-compose.yaml sed -i "s/var_server_ip/${server_ip}/g" docker-compose.yaml +sed -i "s/var_platform/${platform}/g" docker-compose.yaml ``` ### c. 启动docker-compose diff --git "a/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" "b/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" index 349f50a3c125ef3ff8d5adfceffb052442f776de..3d30492533e2998ffc9635c20fdca980e6abc01a 100644 --- "a/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" +++ "b/sig/T-One/content/\347\224\250\346\210\267\346\214\207\345\215\227/\351\203\250\347\275\262\346\211\213\345\206\214/T-One\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" @@ -139,7 +139,7 @@ configuring_docker_compose(){ : ${toneagent_access_key:="$(date +%Y%m%d%H%M%S)"} : ${toneagent_secret_key:="$(date +%Y%m%d%H%M%S)"} - : ${admin_urls_token:="$(date +%Y%m%d%H%M%S)"} + : ${admin_urls_token:="LZYXRPOWIUBCFIHJ"} sed -i "s/data1/${toneagent_access_key}/g" docker-compose.yaml sed -i "s/data2/${toneagent_secret_key}/g" docker-compose.yaml @@ -153,18 +153,19 @@ configuring_docker_compose(){ initial_data(){ # 数据库迁移、创建管理用户等初始化操作 echo "开始初始化数据......." - curl -s "http://${server_ip}:8080/admin/migrate/?token=${admin_urls_token}" - curl -s "http://${server_ip}:8080/admin/init_data/?token=${admin_urls_token}" - curl -s "http://${server_ip}:8080/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." - curl -s "http://${server_ip}:8081/admin/migrate/?token=${admin_urls_token}" - curl -s "http://${server_ip}:8081/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." + curl -s "http://${server_ip}:8080/admin/migrate/?token=${admin_urls_token}" && + curl -s "http://${server_ip}:8080/admin/init_data/?token=${admin_urls_token}" && + curl -s "http://${server_ip}:8080/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." && + curl -s "http://${server_ip}:8081/admin/migrate/?token=${admin_urls_token}" && + curl -s "http://${server_ip}:8081/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." && curl -s "http://${server_ip}:8081/admin/import_access_token/?token=${admin_urls_token}" } # 选择安装项 -color_echo "选择部署方式[1.源代码构建;2.导入镜像](输入:1 | 2)" -read deploy_type +# color_echo "选择部署方式[1.源代码构建;2.导入镜像](输入:1 | 2)" +# read deploy_type +deploy_type="1" color_echo "是否已经安装docker及docker-compose(输入:yes | no):" read docker_installed if [ "$deploy_type" == "1" ]; then @@ -196,7 +197,7 @@ install_docker # 3.部署应用 if [ "$deploy_type" == "1" ]; then - echo "即将使用源代码方式部署....." + echo "即将开始部署....." clone_code configuring_docker_compose by_build_code docker-compose -f $APP_DIR/docker-compose.yaml up --build -d