更新 .gitlab-ci.yml

.gitlab-ci.yml

@@ -9,7 +9,8 @@ cache:
 
 variables:
   PORT: "7084"
-  DOMAIN: "ts"
+  PRED_DOMAIN: "dts"
+  PROD_DOMAIN: "ts"
   KUBECONFIG: /etc/deploy/config
   LAN_REPO: registry-vpc.cn-beijing.aliyuncs.com
   WAN_REPO: registry.cn-beijing.aliyuncs.com
@@ -46,7 +47,6 @@ build_push_image_dev_job:
     - dev
   when: on_success
 deploy_to_dev_job:
-  image: registry-vpc.cn-beijing.aliyuncs.com/qianjia2018/qianjia_public:mvn-docker-kube
   stage: deploy
   before_script:
     - CONTAINER_NAME=`echo $CI_PROJECT_NAME | tr 'A-Z' 'a-z'| tr '_' '-'`
@@ -83,9 +83,16 @@ deploy_to_pred_job:
     - CONTAINER_NAME=`echo $CI_PROJECT_NAME | tr 'A-Z' 'a-z'| tr '_' '-'`
     - TAG=`expr substr $CI_COMMIT_SHA 1 8`
   script:
-    - bash ~/.local/bin/fdeploy.sh  $CONTAINER_NAME  $PORT  80  $WAN_REPO/$PRED_REPO/$CONTAINER_NAME:$TAG  zp  39.106.144.161
+    - mkdir -p /etc/deploy
+    - echo $PRED_CONFIG |base64 -d > $KUBECONFIG
+    - sed -i s/APPNAME/$CONTAINER_NAME/g deployment-pred.yaml
+    - sed -i s/NAMESPACE/$PRED_REPO/g deployment-pred.yaml
+    - sed -i s/CONPORT/$PORT/g deployment-pred.yaml
+    - sed -i s/TAG/$TAG/g deployment-pred.yaml
+    - sed -i s/DOMAIN/$PRED_DOMAIN/g deployment-pred.yaml
+    - kubectl apply -f deployment-pred.yaml
   tags:
-    - ssh-deploy
+    - k8s
   only:
     - release
   when: on_success
@@ -115,13 +122,13 @@ deploy_to_prod_job:
     - TAG=`expr substr $CI_COMMIT_SHA 1 8`
   script:
     - mkdir -p /etc/deploy
-    - echo $KUBE_CONFIG |base64 -d > $KUBECONFIG
-    - sed -i s/APPNAME/$CONTAINER_NAME/g deployment.yaml
-    - sed -i s/NAMESPACE/$PROD_REPO/g deployment.yaml
-    - sed -i s/CONPORT/$PORT/g deployment.yaml
-    - sed -i s/TAG/$TAG/g deployment.yaml
-    - sed -i s/DOMAIN/$DOMAIN/g deployment.yaml
-    - kubectl apply -f deployment.yaml
+    - echo $PROD_CONFIG |base64 -d > $KUBECONFIG
+    - sed -i s/APPNAME/$CONTAINER_NAME/g deployment-prod.yaml
+    - sed -i s/NAMESPACE/$PROD_REPO/g deployment-prod.yaml
+    - sed -i s/CONPORT/$PORT/g deployment-prod.yaml
+    - sed -i s/TAG/$TAG/g deployment-prod.yaml
+    - sed -i s/DOMAIN/$PROD_DOMAIN/g deployment-prod.yaml
+    - kubectl apply -f deployment-prod.yaml
   tags:
     - k8s
   only: