From f5949c7999f79e2fa6a24d985e5006a2e010a6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Thu, 24 Oct 2024 14:29:33 +0800 Subject: [PATCH 1/8] fix: comment for init data --- ...\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 349f50a3c..ab8e37ead 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" @@ -152,7 +152,7 @@ configuring_docker_compose(){ initial_data(){ # 数据库迁移、创建管理用户等初始化操作 - echo "开始初始化数据......." + echo "开始初始化数据，根据机器情况大约需要10分钟左右，请耐心等待......." 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." -- Gitee From 571d191fdc3f6ff977ff0587f2c8539b328d406c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Thu, 24 Oct 2024 14:35:57 +0800 Subject: [PATCH 2/8] fix: comment for init data --- ...\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ab8e37ead..9897672ef 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" @@ -152,7 +152,7 @@ configuring_docker_compose(){ initial_data(){ # 数据库迁移、创建管理用户等初始化操作 - echo "开始初始化数据，根据机器情况大约需要10分钟左右，请耐心等待......." + echo "开始初始化数据，根据机器配置不同大约需要10分钟左右，请耐心等待......." 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." -- Gitee From a01b6abd76b3d5fdd20473e1c81a4afff19beda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Thu, 24 Oct 2024 17:16:48 +0800 Subject: [PATCH 3/8] fix: server ip to local ip --- ...5\212\250\345\214\226\351\203\250\347\275\262.md" | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 9897672ef..c65ef3112 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" @@ -153,12 +153,12 @@ configuring_docker_compose(){ initial_data(){ # 数据库迁移、创建管理用户等初始化操作 echo "开始初始化数据，根据机器配置不同大约需要10分钟左右，请耐心等待......." - 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}" + curl -s "http://127.0.0.1:8080/admin/migrate/?token=${admin_urls_token}" + curl -s "http://127.0.0.1:8080/admin/init_data/?token=${admin_urls_token}" + curl -s "http://127.0.0.1:8080/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." + curl -s "http://127.0.0.1:8081/admin/migrate/?token=${admin_urls_token}" + curl -s "http://127.0.0.1:8081/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." + curl -s "http://127.0.0.1:8081/admin/import_access_token/?token=${admin_urls_token}" } -- Gitee From c662c0d9ba9f81cfae3caef7a8b975ddbdca9db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Fri, 25 Oct 2024 13:23:58 +0800 Subject: [PATCH 4/8] fix: server ip to local ip --- ...2\250\345\214\226\351\203\250\347\275\262.md" | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 c65ef3112..d12d1c035 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 @@ -152,13 +152,13 @@ configuring_docker_compose(){ initial_data(){ # 数据库迁移、创建管理用户等初始化操作 - echo "开始初始化数据，根据机器配置不同大约需要10分钟左右，请耐心等待......." - curl -s "http://127.0.0.1:8080/admin/migrate/?token=${admin_urls_token}" - curl -s "http://127.0.0.1:8080/admin/init_data/?token=${admin_urls_token}" - curl -s "http://127.0.0.1:8080/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." - curl -s "http://127.0.0.1:8081/admin/migrate/?token=${admin_urls_token}" - curl -s "http://127.0.0.1:8081/admin/create_superuser/?token=${admin_urls_token}&username=admin&password=admin123." - curl -s "http://127.0.0.1:8081/admin/import_access_token/?token=${admin_urls_token}" + 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}:8081/admin/import_access_token/?token=${admin_urls_token}" } -- Gitee From 3d0a47497a437682df96bdbce92b11e913c40111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Fri, 25 Oct 2024 14:50:38 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...252\345\212\250\345\214\226\351\203\250\347\275\262.md" | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 d12d1c035..67203bb88 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" @@ -163,8 +163,9 @@ initial_data(){ # 选择安装项 -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 -- Gitee From 7c48d609f791c62797f157ab5324f0ad33df2a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Fri, 25 Oct 2024 14:51:11 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...07\252\345\212\250\345\214\226\351\203\250\347\275\262.md" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 67203bb88..6a0702aea 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" @@ -163,8 +163,8 @@ initial_data(){ # 选择安装项 -#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 -- Gitee From 8ec3542708a0aa219119109d23d51fbe064bc5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Fri, 25 Oct 2024 15:24:28 +0800 Subject: [PATCH 7/8] fix: init data by order --- ...345\212\250\345\214\226\351\203\250\347\275\262.md" | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 6a0702aea..3d3049253 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" @@ -153,11 +153,11 @@ 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}" } -- Gitee From 098fe884ef2b2eb5d7699a595919f881b0466218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AD=A6=E5=B3=B0?= Date: Fri, 25 Oct 2024 17:03:26 +0800 Subject: [PATCH 8/8] feature: platform for arm --- ...One\346\211\213\345\212\250\351\203\250\347\275\262.md" | 7 +++++++ 1 file changed, 7 insertions(+) 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 bfe40dd45..aaa752057 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 -- Gitee