update

.gitlab-ci.yml

 stages:
   - clean
   - dockerbuild
-  - dockerpush
   - deploy
+  - push
 
 
 variables:
@@ -17,31 +17,42 @@ variables:
   ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
   ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
   ACR_EE_NAMESPACE: sharefly-dev
-  ACR_EE_IMAGE: cms
+  ACR_EE_IMAGE: cms-test
   ACR_EE_TAG: $CI_COMMIT_SHA
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/cms.git
+  GITLAB_URL: https://oauth2:6wsXz1Kq2biuG9P1NQ6G@git.mmcuav.cn/dzl/cms-ci-test.git
+
 
 
 mvn_clean:
   stage: clean
   script:
     - echo "清理中ing.........."
-    - mvn clean package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
 
 docker_build:
   stage: dockerbuild
   script:
-    docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
-
-docker_push:
-  stage: dockerpush
-  script:
-    - docker login --username=$ACR_EE_USERNAME $ACR_EE_REGISTRY
-    - docker push $ACR_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG
+    - echo $ACR_EE_USERNAME
+    - echo $ACR_EE_REGISTRY
+    - mvn package -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
+    - docker login -u $ACR_EE_USERNAME -p 'MMC@2023&ACR' $ACR_EE_REGISTRY
+    - docker build -t ${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG} .
+    - docker push "${ACR_EE_REGISTRY}/${ACR_EE_NAMESPACE}/${ACR_EE_IMAGE}:${TAG}"
+    - docker logout
 
 cms-argocd-deploy:
   stage: deploy
+  before_script:
+    - git remote set-url origin "$GITLAB_URL"
+    - git config --global user.name "Administrator" #配置本地仓库用户名信息
+    - git config --global user.email "admin@example.com" #配置本地仓库邮箱信息
   script:
-    cd kustomization/overlays/dev
-    kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
\ No newline at end of file
+    - cd kustomization/overlays/dev
+    - kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
+    - cat kustomization.yaml
+    - git add kustomization.yaml
+    - git commit -am '[skip ci] DEV image update'  #git 本地提交，注意“skip ci”为gitlab流水线文件内置关键字，作用为跳过ci流水线操作，未设置可能导致流水线进入死循环
+    - git push origin master #重新提交修改镜像版本后的代码
+
+