From 7fc344d90f1c29c8e3a7616faa0a6c96d2880d70 Mon Sep 17 00:00:00 2001 From: danial Date: Sat, 2 Nov 2024 16:11:45 +0800 Subject: [PATCH] =?UTF-8?q?ci(.drone.yml):=20=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E5=8D=A1=E5=AF=86=E5=90=8E=E7=AB=AF=E9=83=A8=E7=BD=B2=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E5=B9=B6=E6=B7=BB=E5=8A=A0=20develop=20=E5=88=86?= =?UTF-8?q?=E6=94=AF=E8=A7=A6=E5=8F=91=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉了清空原卡密后端和部署卡密后端的步骤 - 在 failure部分添加了 develop 分支,使其可以触发构建 - 更新 .gitignore 文件,忽略所有 .exe 文件 --- .drone.yml | 15 ++++++++------- .gitignore | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index efbd34c6..bd9e9741 100644 --- a/.drone.yml +++ b/.drone.yml @@ -122,13 +122,13 @@ steps: - name: build new image commands: - docker build --no-cache -t kami_backend:${DRONE_BRANCH}${DRONE_BUILD_NUMBER} -f ./manifest/docker/Dockerfile --build-arg USE_PROXY=0 . - - name: 清空原卡密后端 - commands: - - docker ps -a | (grep -q kami_backend; [ $? -eq 0 ] && docker container stop kami_backend && docker container rm kami_backend) || true - - name: 部署卡密后端 - commands: - - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22401 CONTAINER=kami_backend ALIASES=kami_backend_self USE_PROXY=0 docker compose -f ./manifest/docker/docker-compose.yml -p kami_backend_self down - - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22401 CONTAINER=kami_backend ALIASES=kami_backend_self USE_PROXY=0 docker compose -f ./manifest/docker/docker-compose.yml -p kami_backend_self up -d + # - name: 清空原卡密后端 + # commands: + # - docker ps -a | (grep -q kami_backend; [ $? -eq 0 ] && docker container stop kami_backend && docker container rm kami_backend) || true + # - name: 部署卡密后端 + # commands: + # - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22401 CONTAINER=kami_backend ALIASES=kami_backend_self USE_PROXY=0 docker compose -f ./manifest/docker/docker-compose.yml -p kami_backend_self down + # - VERSION=${DRONE_BRANCH}${DRONE_BUILD_NUMBER} PORT=22401 CONTAINER=kami_backend ALIASES=kami_backend_self USE_PROXY=0 docker compose -f ./manifest/docker/docker-compose.yml -p kami_backend_self up -d - name: 清空原卡密后端(淘宝) commands: - docker ps -a | (grep -q kami_backend_t_mall; [ $? -eq 0 ] && docker container stop kami_backend_t_mall && docker container rm kami_backend_t_mall) || true @@ -143,6 +143,7 @@ trigger: - failure branch: - production + - develop when: event: - push diff --git a/.gitignore b/.gitignore index 2399dd97..1ea4bba3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ bin # **/config/config.yaml.bak2 main.exe~ /qodana.yaml +*.exe \ No newline at end of file