danial/kami_merchant
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: danial:f85a45ad326ee47151bcb1e7d7a2faf86e3774be
Branches Tags
danial:develop danial:production
...
compare: danial:6c847f93bb4a93718acec487fa41ab1415578664
Branches Tags
danial:develop danial:production

2 Commits
f85a45ad32 ... 6c847f93bb

Author SHA1 Message Date
danial
6c847f93bb chore(ci): 移除 Drone CI 配置中的多余 Docker 命令
All checks were successful
continuous-integration/drone/push Build is passing
Details 
- 删除了 docker login 命令，简化登录流程
- 移除了基于分支和版本的 docker compose 启动命令
- 删除了 docker logout 命令，避免冗余操作
 2025-12-17 16:03:51 +08:00
danial
2a39f70f18 chore(ci): 更新DroneCI配置中的Docker仓库地址及服务器IP
Some checks failed
continuous-integration/drone/push Build is failing
Details 
- 将服务器host地址从38.38.251.113:34156修改为38.55.194.49:3422
- 把Docker登录、构建、推送和登出操作的仓库地址由git.oceanpay.cc改为git.domainpay.top
- 保持Docker构建参数和标签规则不变
- 更新Docker Compose部署阶段的登录和登出仓库地址同步变更
 2025-12-17 16:01:56 +08:00
1 changed files with 8 additions and 11 deletions
Expand all files Collapse all files

19
.drone.yml
View File

@@ -4,11 +4,10 @@ type: ssh
name: master-machine
server:
host: 38.38.251.113:34156
host: 38.55.194.49:3422
user: root
password:
from_secret: www_password
clone:
depth: 1
@@ -20,12 +19,12 @@ steps:
DOCKER_TOKEN:
from_secret: docker_token
commands:
- docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
- docker build -t git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
- docker tag git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:latest
- docker push git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
- docker push git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:latest
- docker logout git.oceanpay.cc
- docker login git.domainpay.top -u $DOCKER_LOGIN -p $DOCKER_TOKEN
- docker build -t git.domainpay.top/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
- docker tag git.domainpay.top/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.domainpay.top/danial/kami_merchant_${DRONE_BRANCH}:latest
- docker push git.domainpay.top/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
- docker push git.domainpay.top/danial/kami_merchant_${DRONE_BRANCH}:latest
- docker logout git.domainpay.top
- name: deploy to docker compose
environment:
DOCKER_LOGIN:
@@ -33,9 +32,7 @@ steps:
DOCKER_TOKEN:
from_secret: docker_token
commands:
- docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
- BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yaml --profile merchant up -d
- docker logout git.oceanpay.cc
- docker logout git.domainpay.top
trigger:
branch: