chore(ci): 更新CI配置中的镜像仓库地址和登录信息
- 将.drone.yml中docker登录地址由git.oceanpay.cc替换为git.domainpay.top - 修改相关docker构建、标记及推送的镜像路径为git.domainpay.top - 更新docker-compose.yml中所有服务的镜像地址至git.domainpay.top - 内部日志处理中添加错误日志打印,增强错误排查能力
This commit is contained in:
24
.drone.yml
24
.drone.yml
@@ -4,7 +4,7 @@ type: ssh
|
|||||||
name: master-machine
|
name: master-machine
|
||||||
|
|
||||||
server:
|
server:
|
||||||
host: 38.38.251.113:34156
|
host: 38.55.194.49:3422
|
||||||
user: root
|
user: root
|
||||||
password:
|
password:
|
||||||
from_secret: www_password
|
from_secret: www_password
|
||||||
@@ -19,22 +19,12 @@ steps:
|
|||||||
DOCKER_TOKEN:
|
DOCKER_TOKEN:
|
||||||
from_secret: docker_token
|
from_secret: docker_token
|
||||||
commands:
|
commands:
|
||||||
- docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
- docker login git.domainpay.top -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
||||||
- docker build -t git.oceanpay.cc/danial/kami_backend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f manifest/docker/Dockerfile . --build-arg USE_PROXY=0
|
- docker build -t git.domainpay.top/danial/kami_backend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f manifest/docker/Dockerfile . --build-arg USE_PROXY=0
|
||||||
- docker tag git.oceanpay.cc/danial/kami_backend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.oceanpay.cc/danial/kami_backend_${DRONE_BRANCH}:latest
|
- docker tag git.domainpay.top/danial/kami_backend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.domainpay.top/danial/kami_backend_${DRONE_BRANCH}:latest
|
||||||
- docker push git.oceanpay.cc/danial/kami_backend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
|
- docker push git.domainpay.top/danial/kami_backend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
|
||||||
- docker push git.oceanpay.cc/danial/kami_backend_${DRONE_BRANCH}:latest
|
- docker push git.domainpay.top/danial/kami_backend_${DRONE_BRANCH}:latest
|
||||||
- docker logout git.oceanpay.cc
|
- docker logout git.domainpay.top
|
||||||
# - name: deploy to docker compose
|
|
||||||
# environment:
|
|
||||||
# DOCKER_LOGIN:
|
|
||||||
# from_secret: docker_login
|
|
||||||
# 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 kami_backend up -d
|
|
||||||
# - docker logout git.oceanpay.cc
|
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
kami-db-migrate:
|
kami-db-migrate:
|
||||||
image: git.oceanpay.cc/danial/kami-db-migrate:latest
|
image: git.domainpay.top/danial/kami-db-migrate:latest
|
||||||
container_name: kami-migrate
|
container_name: kami-migrate
|
||||||
profiles:
|
profiles:
|
||||||
- all
|
- all
|
||||||
@@ -20,7 +20,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
createdBy: Developer
|
createdBy: Developer
|
||||||
kami_merchant:
|
kami_merchant:
|
||||||
image: git.oceanpay.cc/danial/kami_merchant_$BRANCH:$VERSION
|
image: git.domainpay.top/danial/kami_merchant_$BRANCH:$VERSION
|
||||||
container_name: kami-merchant-$BRANCH-$VERSION
|
container_name: kami-merchant-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -41,7 +41,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
createdBy: Developer
|
createdBy: Developer
|
||||||
kami_backend:
|
kami_backend:
|
||||||
image: git.oceanpay.cc/danial/kami_backend_$BRANCH:$VERSION
|
image: git.domainpay.top/danial/kami_backend_$BRANCH:$VERSION
|
||||||
container_name: kami-backend-$BRANCH-$VERSION
|
container_name: kami-backend-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -65,7 +65,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
createdBy: Developer
|
createdBy: Developer
|
||||||
kami_shop:
|
kami_shop:
|
||||||
image: git.oceanpay.cc/danial/kami_shop_$BRANCH:$VERSION
|
image: git.domainpay.top/danial/kami_shop_$BRANCH:$VERSION
|
||||||
container_name: kami-shop-$BRANCH-$VERSION
|
container_name: kami-shop-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -86,7 +86,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
createdBy: Developer
|
createdBy: Developer
|
||||||
kami_gateway:
|
kami_gateway:
|
||||||
image: git.oceanpay.cc/danial/kami_gateway_$BRANCH:$VERSION
|
image: git.domainpay.top/danial/kami_gateway_$BRANCH:$VERSION
|
||||||
container_name: kami-gateway-$BRANCH-$VERSION
|
container_name: kami-gateway-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -110,7 +110,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
createdBy: Developer
|
createdBy: Developer
|
||||||
kami_boss:
|
kami_boss:
|
||||||
image: git.oceanpay.cc/danial/kami_boss_$BRANCH:$VERSION
|
image: git.domainpay.top/danial/kami_boss_$BRANCH:$VERSION
|
||||||
container_name: kami-boss-$BRANCH-$VERSION
|
container_name: kami-boss-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -131,7 +131,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
createdBy: Developer
|
createdBy: Developer
|
||||||
kami_frontend:
|
kami_frontend:
|
||||||
image: git.oceanpay.cc/danial/kami_frontend_$BRANCH:$VERSION
|
image: git.domainpay.top/danial/kami_frontend_$BRANCH:$VERSION
|
||||||
container_name: kami-frontend-$BRANCH-$VERSION
|
container_name: kami-frontend-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
@@ -149,7 +149,7 @@ services:
|
|||||||
- frontend
|
- frontend
|
||||||
- all
|
- all
|
||||||
kami-spider-monorepo:
|
kami-spider-monorepo:
|
||||||
image: git.oceanpay.cc/danial/kami-spider-monorepo-$BRANCH:$VERSION
|
image: git.domainpay.top/danial/kami-spider-monorepo-$BRANCH:$VERSION
|
||||||
container_name: kami-spider-monorepo-$BRANCH-$VERSION
|
container_name: kami-spider-monorepo-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
profiles:
|
profiles:
|
||||||
@@ -177,7 +177,7 @@ services:
|
|||||||
labels:
|
labels:
|
||||||
createdBy: Developer
|
createdBy: Developer
|
||||||
jd-token-server:
|
jd-token-server:
|
||||||
image: git.oceanpay.cc/danial/jd-token-server-$BRANCH:$VERSION
|
image: git.domainpay.top/danial/jd-token-server-$BRANCH:$VERSION
|
||||||
container_name: jd-token-server-$BRANCH-$VERSION
|
container_name: jd-token-server-$BRANCH-$VERSION
|
||||||
restart: always
|
restart: always
|
||||||
profiles:
|
profiles:
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package errHandler
|
|||||||
import (
|
import (
|
||||||
"github.com/gogf/gf/v2/errors/gcode"
|
"github.com/gogf/gf/v2/errors/gcode"
|
||||||
"github.com/gogf/gf/v2/errors/gerror"
|
"github.com/gogf/gf/v2/errors/gerror"
|
||||||
|
"github.com/gogf/gf/v2/os/glog"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -11,6 +12,7 @@ func WrapError(ctx context.Context, code gcode.Code, err error, message ...strin
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
newMsg := ""
|
newMsg := ""
|
||||||
|
glog.Error(ctx, "错误", err)
|
||||||
if len(message) != 0 {
|
if len(message) != 0 {
|
||||||
newMsg = message[0]
|
newMsg = message[0]
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user