合并分支 'release' 到 'master'

增加master分支

查看合并请求 QJMIS-CPD/CPD_company_site/web_company_site!50

.gitlab-ci.yml

@@ -54,6 +54,19 @@ build_push_image_pred:
     only:
         - release      
 
+build_push_image_prod:
+    stage: build
+    before_script:
+      - docker login --username=wangnannan@1520818330092673 --password="qj123123" registry-vpc.cn-beijing.aliyuncs.com
+
+    script:
+        - docker build -t $PROD_REPO:$CONTAINER_NAME .
+        - docker push $PROD_REPO:$CONTAINER_NAME
+    tags:
+        - docker-run
+    only:
+        - master
+
         
 remote_run_image_dev:
     stage: deploy
@@ -74,4 +87,14 @@ remote_run_image_pred:
         - shell-prod 
     only:
         - release
-    when: on_success
+    when: on_success
\ No newline at end of file
+    
+remote_run_image_prod:
+    stage: deploy
+
+    script:
+      - bash ~/.local/bin/fdeploy.sh $CONTAINER_NAME  7084  80  $PROD_REPO:$CONTAINER_NAME   zp 39.106.17.245
+    tags:
+        - shell-prod
+    only:
+        - master