gitlab-ci

.gitlab-ci.yml

@@ -25,8 +25,29 @@ mvn_clean:
     - echo "情理中..."
     - mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
 
-docker_build:
+docker_build_dev:
   stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly-dev
+    ACR_EE_NAMESPACE: sharefly-dev
+  only:
+   - develop
+  script:
+    - 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 logouts
+
+docker_build_prod:
+  stage: dockerbuild
+  variables:
+    NAMESPACE: sharefly
+    ACR_EE_NAMESPACE: sharefly
+  only:
+    - master
   script:
     - echo $ACR_EE_USERNAME
     - echo $ACR_EE_REGISTRY
@@ -67,7 +88,6 @@ kustomize_set_image_prod:
     ACR_EE_NAMESPACE: sharefly
   only:
     - master
-    - merge
   before_script:
     - echo "master"
     - git config --global user.name "bax" #配置本地仓库用户名信息