File tree Expand file tree Collapse file tree 3 files changed +2
-24
lines changed Expand file tree Collapse file tree 3 files changed +2
-24
lines changed Original file line number Diff line number Diff line change @@ -23,13 +23,6 @@ stages:
2323 HOST_NAME : $HOST_NAME_CHINA
2424 KUBE_CONFIG : $KUBE_CONFIG_CHINA
2525
26- .us :
27- before_script :
28- - cp $PROJECT_CONFIG_UNITED_STATES ./helm/files/production.yaml
29- variables :
30- HOST_NAME : $HOST_NAME_UNITED_STATES
31- KUBE_CONFIG : $KUBE_CONFIG_UNITED_STATES
32-
3326.docker_build : &DOCKER_BUILD
3427 stage : build_image
3528 image : docker:19.03.12
@@ -118,24 +111,9 @@ deploy_dev_cn:
118111 extends : .cn
119112 << : *DEV
120113
121- deploy_dev_us :
122- << : *DEPLOY
123- extends : .us
124- variables :
125- DOCKER_TAG : dev-$CI_COMMIT_SHA
126- << : *DEV
127-
128114deploy_prod_cn :
129115 << : *DEPLOY
130116 extends : .cn
131117 variables :
132118 DOCKER_TAG : $CI_COMMIT_SHA
133119 << : *PROD
134-
135- deploy_prod_us :
136- << : *DEPLOY
137- extends : .us
138- variables :
139- DOCKER_TAG : $CI_COMMIT_SHA
140- << : *PROD
141-
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ export const Server = {
99 name : "flat-server" ,
1010 version : packages . version ,
1111 env : config . server . env ,
12- region : config . server . region ,
12+ region : config . server . region || "CN" ,
1313 regionCode : config . server . region_code || 0 ,
1414} ;
1515
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ type Config = {
3030 server : {
3131 port : number ;
3232 env : string ;
33- region : string ;
33+ region : string | null ;
3434 region_code : number | null ;
3535 } ;
3636 redis : {
You can’t perform that action at this time.
0 commit comments