Merge branch 'master' of git.aipark.com:eoc-group/dotnet-cicd-demo

.gitlab-ci.yml

@@ -13,13 +13,13 @@ before_script:
   - export TZ=Asia/Shanghai
   - echo $CI_REGISTRY_IMAGE
   # 使用当前小时时间和提交SHA值来构建，因为公司的GitLab10.0版本太低不支持提交时间，另外还得考虑ARM\X86双平台，同时我不会任务间传参，所以凑合这么写吧
-  - export FULLVERSION=$BASE_VERSION.$(date +"%Y%m%d%H")-${CI_COMMIT_SHA:0:7}
+  - export FULLVERSION=$BASE_VERSION.$(date +"%y%m%d%H")-${CI_COMMIT_SHA:0:7}
   - echo $FULLVERSION
   - echo "$CI_REGISTRY_PASSWORD" | docker login --username 'tcr$eoc' --password-stdin $CI_REGISTRY
 
 stages:
   - build
-  - deploy
+  - manifest
 
 build-master-x86:
   stage: build
@@ -42,7 +42,7 @@ build-master-arm64:
     - arm64
 
 build-manifest:
-  stage: deploy
+  stage: manifest
   script:
     - docker manifest create $CI_REGISTRY_IMAGE:$FULLVERSION $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 $CI_REGISTRY_IMAGE:$FULLVERSION-arm64
     - docker manifest push $CI_REGISTRY_IMAGE:$FULLVERSION