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

.gitlab-ci.yml

 # This file is a template, and might need editing before it works on your project.
 # Official docker image.
 variables:
-  BASE_VERSION: "1.0"
   CI_REGISTRY: "k8s-t0.tencentcloudcr.com"
   CI_REGISTRY_IMAGE: "k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo"
 
@@ -14,7 +13,7 @@ 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
   - export