server/mylomen-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

to:sync

Browse Source
This commit is contained in:
shaoyongjun 2024-05-12 13:15:07 +08:00
parent f670c5466a
commit 1935529090
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -62,12 +62,12 @@ deploy:
image: laoma/nomad:v1 image: laoma/nomad:v1
stage: deploy stage: deploy
script: script:
- nomad status -address=http://10.0.0.5:4646 - nomad status -address=http://10.0.12.8:4646 -token=${PROD_NOMAD_TOKEN}
- envsubst < nomad-job-test.tpl.hcl > nomad-job.hcl - envsubst < nomad-job-test.tpl.hcl > nomad-job.hcl
- cat nomad-job.hcl - cat nomad-job.hcl
- nomad validate nomad-job.hcl - nomad validate nomad-job.hcl
- nomad plan -address=http://10.0.0.5:4646 nomad-job.hcl 2>&1 |sed 's/\(password[^ \t]*[ \t]*\).*/\1 ... /' |tee plan.log || echo - nomad plan -address=http://10.0.12.8:4646 -token=${PROD_NOMAD_TOKEN} nomad-job.hcl 2>&1 |sed 's/\(password[^ \t]*[ \t]*\).*/\1 ... /' |tee plan.log || echo
- export INDEX=$(grep -E -o -- '-check-index [0-9]+' plan.log |tr -dc 0-9) - export INDEX=$(grep -E -o -- '-check-index [0-9]+' plan.log |tr -dc 0-9)
- nomad run -check-index $INDEX -address=http://10.0.0.5:4646 nomad-job.hcl - nomad run -check-index $INDEX -token=${PROD_NOMAD_TOKEN} -address=http://10.0.12.8:4646 nomad-job.hcl
dependencies: dependencies:
- docker-package - docker-package

8
common/config/config.prod.yaml
View File

@ -4,8 +4,8 @@ fbServer:
# fbConsul # fbConsul
fbConsul: fbConsul:
address: 10.0.0.5:8500 address: 10.0.12.8:8500
datacenter: dg01 datacenter: sh01
token: 4b29ca6c-3233-4c70-7bb1-a3f4c2a18281 token: 4b29ca6c-3233-4c70-7bb1-a3f4c2a18281
# rpc # rpc
@ -15,7 +15,7 @@ rpc:
# mysql # mysql
mysql: mysql:
logSql: false logSql: false
dsn: uc:zELLqwk2hBp8QyJgEtH5YGc6WKMS3dXP@tcp(10.0.0.5:10119)/user_center?charset=utf8mb4&parseTime=True&loc=Local dsn: uc:zELLqwk2hBp8QyJgEtH5YGc6WKMS3dXP@tcp(10.0.12.8:10119)/user_center?charset=utf8mb4&parseTime=True&loc=Local
maxIdleConn: 4 maxIdleConn: 4
maxOpenConn: 4 maxOpenConn: 4
connMaxLifetime: 3000 connMaxLifetime: 3000
@ -23,7 +23,7 @@ mysql:
# redis # redis
redis: redis:
db: 1 db: 1
addr: 10.0.0.5:6379 addr: 10.0.12.8:6379
readTimeout: 6000 readTimeout: 6000
writeTimeout: 6000 writeTimeout: 6000

6
nomad-job-test.tpl.hcl
View File

@ -1,5 +1,5 @@
job "${APP_NAME}-${CI_COMMIT_BRANCH}-job" { job "${APP_NAME}-${CI_COMMIT_BRANCH}-job" {
datacenters = ["dj01"] datacenters = ["sh01"]
type = "service" type = "service"
group "${APP_NAME}-${CI_COMMIT_BRANCH}-group" { group "${APP_NAME}-${CI_COMMIT_BRANCH}-group" {
@ -29,11 +29,9 @@ job "${APP_NAME}-${CI_COMMIT_BRANCH}-job" {
config { config {
image = "${CURRENT_IMAGE_URL}" image = "${CURRENT_IMAGE_URL}"
network_mode = "djLay" network_mode = "sh01"
# No port map required. # No port map required.
# volumes = ["/opt/settings/server.properties:/opt/settings/server.properties"]
auth { auth {
server_address = "${CI_REGISTRY}" server_address = "${CI_REGISTRY}"
username = "${CI_REGISTRY_USER}" username = "${CI_REGISTRY_USER}"