From f3c698b401507fb836d7b84f5eb95812672b0785 Mon Sep 17 00:00:00 2001 From: eazzy <1044745821@qq.com> Date: Mon, 24 Jun 2024 19:40:31 +0800 Subject: [PATCH 01/22] yangyizhe_config --- .idea/.gitignore | 3 +++ .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ .idea/misc.xml | 4 ++++ .idea/modules.xml | 8 ++++++++ .idea/reposync.iml | 12 ++++++++++++ .idea/vcs.xml | 6 ++++++ main.py | 2 +- src/base/config.py | 10 +++++----- src/do/account.py | 2 +- 9 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/reposync.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 000000000..105ce2da2 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..d56657add --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..0226e89ac --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/reposync.iml b/.idea/reposync.iml new file mode 100644 index 000000000..8b8c39547 --- /dev/null +++ b/.idea/reposync.iml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/main.py b/main.py index 990b276be..2137653ad 100644 --- a/main.py +++ b/main.py @@ -25,7 +25,7 @@ app.include_router(LOG) app.include_router(AUTH) app.include_router(SYNC_CONFIG) -app.mount("/", StaticFiles(directory="web/dist"), name="static") +# app.mount("/", StaticFiles(directory="web/dist"), name="static") if __name__ == '__main__': # workers 参数仅在命令行使用uvicorn启动时有效 或使用环境变量 WEB_CONCURRENCY diff --git a/src/base/config.py b/src/base/config.py index d930e9a1e..e30c0fd18 100644 --- a/src/base/config.py +++ b/src/base/config.py @@ -33,11 +33,11 @@ buc_key and ConfigsUtil.set_obfastapi_config('buc_key', buc_key) DB_ENV = getenv('DB_ENV', 'test_env') DB = { 'test_env': { - 'host': getenv('CEROBOT_MYSQL_HOST', ''), - 'port': getenv('CEROBOT_MYSQL_PORT', 2883, int), - 'user': getenv('CEROBOT_MYSQL_USER', ''), - 'passwd': getenv('CEROBOT_MYSQL_PWD', ''), - 'dbname': getenv('CEROBOT_MYSQL_DB', '') + 'host': getenv('CEROBOT_MYSQL_HOST', 'localhost'), + 'port': getenv('CEROBOT_MYSQL_PORT', 3306, int), + 'user': getenv('CEROBOT_MYSQL_USER', 'root'), + 'passwd': getenv('CEROBOT_MYSQL_PWD', 'MYSQLqwer35257'), + 'dbname': getenv('CEROBOT_MYSQL_DB', 'reposync') }, 'local': { 'host': getenv('CEROBOT_MYSQL_HOST', ''), diff --git a/src/do/account.py b/src/do/account.py index 17a5121d6..ae2984738 100644 --- a/src/do/account.py +++ b/src/do/account.py @@ -10,8 +10,8 @@ class GithubAccountDO(DataObject): account = Column(String(20)) email = Column(String(20)) create_time = Column(DateTime) - update_time = Column(DateTime) + update_time = Column(DateTime) class GiteeAccountDO(DataObject): __tablename__ = 'gitee_account' -- 2.34.1 From dad960e7ce3f6971abc39124be9562544a156dcf Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 12:23:15 +0000 Subject: [PATCH 02/22] =?UTF-8?q?feat:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .devops/未命名项目.yml diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml new file mode 100644 index 000000000..b068e1d04 --- /dev/null +++ b/.devops/未命名项目.yml @@ -0,0 +1,34 @@ +version: 2 +name: 未命名项目 +description: "" +global: + concurrent: 1 +trigger: + webhook: gitlink@1.0.0 + event: + - ref: push + ruleset: + - param-ref: branch + operator: EQ + value: '"master"' + ruleset-operator: AND +workflow: + - ref: start + name: 开始 + task: start + - ref: end + name: 结束 + task: end + needs: + - git_clone_0 + - ref: git_clone_0 + name: git clone + task: git_clone@1.2.9 + input: + remote_url: '""' + ref: '"refs/heads/master"' + commit_id: '""' + depth: 1 + needs: + - start + -- 2.34.1 From ac6f0e1356c4f73d543f926afcd58526dc52b40b Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 12:27:15 +0000 Subject: [PATCH 04/22] =?UTF-8?q?refactor:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 38 +++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml index b068e1d04..e1cf0ee0c 100644 --- a/.devops/未命名项目.yml +++ b/.devops/未命名项目.yml @@ -20,15 +20,49 @@ workflow: name: 结束 task: end needs: - - git_clone_0 + - ssh_cmd_0 - ref: git_clone_0 name: git clone task: git_clone@1.2.9 input: - remote_url: '""' + remote_url: '"https://gitlink.org.cn/Eazzy/reposync.git"' ref: '"refs/heads/master"' commit_id: '""' depth: 1 needs: - start + - ref: docker_image_build_0 + name: docker镜像构建 + task: docker_image_build@1.6.0 + input: + docker_username: ((docker.username)) + docker_password: ((docker.docker_key)) + image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest"' + image_tag: '"latest"' + registry_address: '"registry.cn-guangzhou.aliyuncs.com"' + docker_file: '"Dockerfile"' + docker_build_path: '"."' + workspace: '"."' + image_push: true + build_args: '""' + needs: + - git_clone_0 + - ref: ssh_cmd_0 + name: ssh执行命令 + task: ssh_cmd@1.1.1 + input: + ssh_pass: ((ssh.key)) + ssh_ip: '"121.43.168.217"' + ssh_port: '"22"' + ssh_user: '"root"' + ssh_cmd: "\"docker stop reposyncer_app && docker rm reposyncer_app && docker + pull + registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center_grou\ + peazzy:latest && docker run -it -d -e CEROBOT_MYSQL_HOST='8.134.99.218' + -e CEROBOT_MYSQL_PORT=3306 -e CEROBOT_MYSQL_USER=root -e + CEROBOT_MYSQL_PWD='951623847' -e CEROBOT_MYSQL_DB='reposyncer' -e + BOOT_MODE='app' -p 8089:8000 --name reposyncer_app + registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest\"" + needs: + - docker_image_build_0 -- 2.34.1 From f1233090279ae20692fe449ed031c06326ba3582 Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 20:42:56 +0800 Subject: [PATCH 05/22] Update Dockerfile --- Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 24a7ae2bd..ac13ef4a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM centos:7 +LABEL maintainer="yangyizhe <1044745821@qq.com>" + RUN yum update -y && \ yum install -y wget gcc make openssl-devel bzip2-devel libffi-devel zlib-devel RUN wget -P /data/ob-tool https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tgz @@ -7,7 +9,11 @@ RUN cd /data/ob-tool && tar xzf Python-3.9.6.tgz RUN cd /data/ob-tool/Python-3.9.6 && ./configure --enable-optimizations && make altinstall ADD ./ /data/ob-robot/ -RUN cd /data/ob-robot/ && \ +RUN wget https://github.com/encode/uvicorn/archive/refs/tags/0.14.0.tar.gz && \ + tar -zvxf 0.14.0.tar.gz && \ + cd uvicorn-0.14.0 && \ + pip3.9 install . && \ + cd /data/ob-robot/ && \ pip3.9 install -r /data/ob-robot/requirement.txt RUN yum install -y git openssh-server -- 2.34.1 From 32a5f17735a93cb0aa306f4bf4ad4e60c95e42bd Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 12:44:37 +0000 Subject: [PATCH 06/22] =?UTF-8?q?refactor:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml index e1cf0ee0c..dde50b079 100644 --- a/.devops/未命名项目.yml +++ b/.devops/未命名项目.yml @@ -36,7 +36,7 @@ workflow: task: docker_image_build@1.6.0 input: docker_username: ((docker.username)) - docker_password: ((docker.docker_key)) + docker_password: ((docker.key)) image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest"' image_tag: '"latest"' registry_address: '"registry.cn-guangzhou.aliyuncs.com"' -- 2.34.1 From ebfe1e34e4b5daf4fe7a625fc03a9412b6ee5ffd Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 12:47:37 +0000 Subject: [PATCH 09/22] =?UTF-8?q?refactor:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml index dde50b079..e04d3f152 100644 --- a/.devops/未命名项目.yml +++ b/.devops/未命名项目.yml @@ -57,9 +57,9 @@ workflow: ssh_user: '"root"' ssh_cmd: "\"docker stop reposyncer_app && docker rm reposyncer_app && docker pull - registry.cn-guangzhou.aliyuncs.com/nudt_devops/gitlink_help_center_grou\ - peazzy:latest && docker run -it -d -e CEROBOT_MYSQL_HOST='8.134.99.218' - -e CEROBOT_MYSQL_PORT=3306 -e CEROBOT_MYSQL_USER=root -e + registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest && + docker run -it -d -e CEROBOT_MYSQL_HOST='8.134.99.218' -e + CEROBOT_MYSQL_PORT=3306 -e CEROBOT_MYSQL_USER=root -e CEROBOT_MYSQL_PWD='951623847' -e CEROBOT_MYSQL_DB='reposyncer' -e BOOT_MODE='app' -p 8089:8000 --name reposyncer_app registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest\"" -- 2.34.1 From c39b5861bea880e14fc107eddbd71bed5c996f1c Mon Sep 17 00:00:00 2001 From: eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 20:50:31 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0config=E5=92=8Cdockerfi?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 8 +++++++- src/base/config.py | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 24a7ae2bd..ac13ef4a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM centos:7 +LABEL maintainer="yangyizhe <1044745821@qq.com>" + RUN yum update -y && \ yum install -y wget gcc make openssl-devel bzip2-devel libffi-devel zlib-devel RUN wget -P /data/ob-tool https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tgz @@ -7,7 +9,11 @@ RUN cd /data/ob-tool && tar xzf Python-3.9.6.tgz RUN cd /data/ob-tool/Python-3.9.6 && ./configure --enable-optimizations && make altinstall ADD ./ /data/ob-robot/ -RUN cd /data/ob-robot/ && \ +RUN wget https://github.com/encode/uvicorn/archive/refs/tags/0.14.0.tar.gz && \ + tar -zvxf 0.14.0.tar.gz && \ + cd uvicorn-0.14.0 && \ + pip3.9 install . && \ + cd /data/ob-robot/ && \ pip3.9 install -r /data/ob-robot/requirement.txt RUN yum install -y git openssh-server diff --git a/src/base/config.py b/src/base/config.py index e30c0fd18..d96c00abf 100644 --- a/src/base/config.py +++ b/src/base/config.py @@ -33,11 +33,11 @@ buc_key and ConfigsUtil.set_obfastapi_config('buc_key', buc_key) DB_ENV = getenv('DB_ENV', 'test_env') DB = { 'test_env': { - 'host': getenv('CEROBOT_MYSQL_HOST', 'localhost'), + 'host': getenv('CEROBOT_MYSQL_HOST', '8.134.99.218'), 'port': getenv('CEROBOT_MYSQL_PORT', 3306, int), 'user': getenv('CEROBOT_MYSQL_USER', 'root'), - 'passwd': getenv('CEROBOT_MYSQL_PWD', 'MYSQLqwer35257'), - 'dbname': getenv('CEROBOT_MYSQL_DB', 'reposync') + 'passwd': getenv('CEROBOT_MYSQL_PWD', '951623847'), + 'dbname': getenv('CEROBOT_MYSQL_DB', 'reposyncer') }, 'local': { 'host': getenv('CEROBOT_MYSQL_HOST', ''), -- 2.34.1 From 3f74a9b0a8d311c9605b22fa5f704cc24ae5844f Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 12:53:43 +0000 Subject: [PATCH 11/22] =?UTF-8?q?refactor:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml index e04d3f152..cf74d465d 100644 --- a/.devops/未命名项目.yml +++ b/.devops/未命名项目.yml @@ -37,7 +37,7 @@ workflow: input: docker_username: ((docker.username)) docker_password: ((docker.key)) - image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest"' + image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy"' image_tag: '"latest"' registry_address: '"registry.cn-guangzhou.aliyuncs.com"' docker_file: '"Dockerfile"' -- 2.34.1 From 27e48806a8499f2699c1f80cebd2402f4cbf18a5 Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 12:56:54 +0000 Subject: [PATCH 12/22] =?UTF-8?q?refactor:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml index cf74d465d..1042c341b 100644 --- a/.devops/未命名项目.yml +++ b/.devops/未命名项目.yml @@ -42,7 +42,7 @@ workflow: registry_address: '"registry.cn-guangzhou.aliyuncs.com"' docker_file: '"Dockerfile"' docker_build_path: '"."' - workspace: '"."' + workspace: git_clone_0.git_path image_push: true build_args: '""' needs: -- 2.34.1 From bc5a60cbe287242439b273a25584f9a64363bc27 Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Thu, 27 Jun 2024 21:01:52 +0800 Subject: [PATCH 14/22] Update Dockerfile --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac13ef4a8..c91eaca28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,5 @@ FROM centos:7 -LABEL maintainer="yangyizhe <1044745821@qq.com>" - RUN yum update -y && \ yum install -y wget gcc make openssl-devel bzip2-devel libffi-devel zlib-devel RUN wget -P /data/ob-tool https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tgz @@ -27,7 +25,8 @@ RUN yum install -y autoconf gettext && \ make configure && \ ./configure --prefix=/usr && \ make -j16 && \ - make install - + make install + + WORKDIR /data/ob-robot CMD if [ "$BOOT_MODE" = "app" ] ; then python3.9 main.py; fi -- 2.34.1 From 747cd13764bfe8b3b14a0cdda978c21ed6186e0d Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Fri, 28 Jun 2024 01:12:25 +0000 Subject: [PATCH 15/22] =?UTF-8?q?refactor:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml index 1042c341b..c150c60f7 100644 --- a/.devops/未命名项目.yml +++ b/.devops/未命名项目.yml @@ -3,15 +3,6 @@ name: 未命名项目 description: "" global: concurrent: 1 -trigger: - webhook: gitlink@1.0.0 - event: - - ref: push - ruleset: - - param-ref: branch - operator: EQ - value: '"master"' - ruleset-operator: AND workflow: - ref: start name: 开始 -- 2.34.1 From c7d6ed914e7d44ab2455e27a98b02f8227515321 Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Fri, 28 Jun 2024 01:13:01 +0000 Subject: [PATCH 16/22] =?UTF-8?q?refactor:=20delete=20.devops/=E6=9C=AA?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 59 ------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 .devops/未命名项目.yml diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml deleted file mode 100644 index c150c60f7..000000000 --- a/.devops/未命名项目.yml +++ /dev/null @@ -1,59 +0,0 @@ -version: 2 -name: 未命名项目 -description: "" -global: - concurrent: 1 -workflow: - - ref: start - name: 开始 - task: start - - ref: end - name: 结束 - task: end - needs: - - ssh_cmd_0 - - ref: git_clone_0 - name: git clone - task: git_clone@1.2.9 - input: - remote_url: '"https://gitlink.org.cn/Eazzy/reposync.git"' - ref: '"refs/heads/master"' - commit_id: '""' - depth: 1 - needs: - - start - - ref: docker_image_build_0 - name: docker镜像构建 - task: docker_image_build@1.6.0 - input: - docker_username: ((docker.username)) - docker_password: ((docker.key)) - image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy"' - image_tag: '"latest"' - registry_address: '"registry.cn-guangzhou.aliyuncs.com"' - docker_file: '"Dockerfile"' - docker_build_path: '"."' - workspace: git_clone_0.git_path - image_push: true - build_args: '""' - needs: - - git_clone_0 - - ref: ssh_cmd_0 - name: ssh执行命令 - task: ssh_cmd@1.1.1 - input: - ssh_pass: ((ssh.key)) - ssh_ip: '"121.43.168.217"' - ssh_port: '"22"' - ssh_user: '"root"' - ssh_cmd: "\"docker stop reposyncer_app && docker rm reposyncer_app && docker - pull - registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest && - docker run -it -d -e CEROBOT_MYSQL_HOST='8.134.99.218' -e - CEROBOT_MYSQL_PORT=3306 -e CEROBOT_MYSQL_USER=root -e - CEROBOT_MYSQL_PWD='951623847' -e CEROBOT_MYSQL_DB='reposyncer' -e - BOOT_MODE='app' -p 8089:8000 --name reposyncer_app - registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest\"" - needs: - - docker_image_build_0 - -- 2.34.1 From 2069ca7c2fa758b6726aa1d4eec081facc34512a Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Fri, 28 Jun 2024 01:13:01 +0000 Subject: [PATCH 17/22] =?UTF-8?q?feat:=20.devops/REPO=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/REPO流水线.yml | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .devops/REPO流水线.yml diff --git a/.devops/REPO流水线.yml b/.devops/REPO流水线.yml new file mode 100644 index 000000000..c1b4a1cd1 --- /dev/null +++ b/.devops/REPO流水线.yml @@ -0,0 +1,59 @@ +version: 2 +name: REPO流水线 +description: 取消了自动触发，手动触发，有时候网络可能不好，镜像那里需要重试。 +global: + concurrent: 1 +workflow: + - ref: start + name: 开始 + task: start + - ref: end + name: 结束 + task: end + needs: + - ssh_cmd_0 + - ref: git_clone_0 + name: git clone + task: git_clone@1.2.9 + input: + remote_url: '"https://gitlink.org.cn/Eazzy/reposync.git"' + ref: '"refs/heads/master"' + commit_id: '""' + depth: 1 + needs: + - start + - ref: docker_image_build_0 + name: docker镜像构建 + task: docker_image_build@1.6.0 + input: + docker_username: ((docker.username)) + docker_password: ((docker.key)) + image_name: '"registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy"' + image_tag: '"latest"' + registry_address: '"registry.cn-guangzhou.aliyuncs.com"' + docker_file: '"Dockerfile"' + docker_build_path: '"."' + workspace: git_clone_0.git_path + image_push: true + build_args: '""' + needs: + - git_clone_0 + - ref: ssh_cmd_0 + name: ssh执行命令 + task: ssh_cmd@1.1.1 + input: + ssh_pass: ((ssh.key)) + ssh_ip: '"121.43.168.217"' + ssh_port: '"22"' + ssh_user: '"root"' + ssh_cmd: "\"docker stop reposyncer_app && docker rm reposyncer_app && docker + pull + registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest && + docker run -it -d -e CEROBOT_MYSQL_HOST='8.134.99.218' -e + CEROBOT_MYSQL_PORT=3306 -e CEROBOT_MYSQL_USER=root -e + CEROBOT_MYSQL_PWD='951623847' -e CEROBOT_MYSQL_DB='reposyncer' -e + BOOT_MODE='app' -p 8089:8000 --name reposyncer_app + registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest\"" + needs: + - docker_image_build_0 + -- 2.34.1 From ba8c072752acc7ed58aee29414d1366154e55fc0 Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Fri, 12 Jul 2024 02:06:44 +0000 Subject: [PATCH 18/22] =?UTF-8?q?refactor:=20.devops/REPO=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/REPO流水线.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/REPO流水线.yml b/.devops/REPO流水线.yml index c1b4a1cd1..5822825bf 100644 --- a/.devops/REPO流水线.yml +++ b/.devops/REPO流水线.yml @@ -17,7 +17,7 @@ workflow: task: git_clone@1.2.9 input: remote_url: '"https://gitlink.org.cn/Eazzy/reposync.git"' - ref: '"refs/heads/master"' + ref: '"refs/heads/develop"' commit_id: '""' depth: 1 needs: -- 2.34.1 From 2a9b02f4e130c5f29690c3d5cd03d126ed989f33 Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Fri, 12 Jul 2024 02:14:02 +0000 Subject: [PATCH 20/22] =?UTF-8?q?refactor:=20.devops/REPO=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/REPO流水线.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devops/REPO流水线.yml b/.devops/REPO流水线.yml index 5822825bf..481c9f2cb 100644 --- a/.devops/REPO流水线.yml +++ b/.devops/REPO流水线.yml @@ -49,9 +49,9 @@ workflow: ssh_cmd: "\"docker stop reposyncer_app && docker rm reposyncer_app && docker pull registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest && - docker run -it -d -e CEROBOT_MYSQL_HOST='8.134.99.218' -e + docker run -it -d -e CEROBOT_MYSQL_HOST='121.43.168.217' -e CEROBOT_MYSQL_PORT=3306 -e CEROBOT_MYSQL_USER=root -e - CEROBOT_MYSQL_PWD='951623847' -e CEROBOT_MYSQL_DB='reposyncer' -e + CEROBOT_MYSQL_PWD='Zcq123456.' -e CEROBOT_MYSQL_DB='repo' -e BOOT_MODE='app' -p 8089:8000 --name reposyncer_app registry.cn-guangzhou.aliyuncs.com/nudt_devops/reposync_eazzy:latest\"" needs: -- 2.34.1 From 936374f50c1592c62f3151696bc9c0fc58b6ca4c Mon Sep 17 00:00:00 2001 From: Eazzy <1044745821@qq.com> Date: Fri, 12 Jul 2024 02:14:44 +0000 Subject: [PATCH 22/22] =?UTF-8?q?refactor:=20.devops/REPO=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/REPO流水线.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.devops/REPO流水线.yml b/.devops/REPO流水线.yml index 481c9f2cb..45341c20c 100644 --- a/.devops/REPO流水线.yml +++ b/.devops/REPO流水线.yml @@ -3,6 +3,15 @@ name: REPO流水线 description: 取消了自动触发，手动触发，有时候网络可能不好，镜像那里需要重试。 global: concurrent: 1 +trigger: + webhook: gitlink@1.0.0 + event: + - ref: push + ruleset: + - param-ref: branch + operator: EQ + value: '"develop"' + ruleset-operator: AND workflow: - ref: start name: 开始 -- 2.34.1