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:
-  FullVERSION: "1.0.${CI_COMMIT_TIMESTAMP}"
+  BASEVERSION: "1.0"
+  CI_TIMESTAMP: "$CI_COMMIT_TIMESTAMP"
   CI_REGISTRY_IMAGE: "k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo"
 
 image: docker:latest
@@ -12,12 +13,13 @@ services:
 before_script:
   - echo $CI_REGISTRY_IMAGE
   - echo $CI_COMMIT_REF_SLUG
-  - echo $FULLVERSION
+  - echo $BASEVERSION.$CI_TIMESTAMP
   - docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 build-master-x86:
   stage: build
   script:
+    - FULLVERSION=$BASEVERSION.$CI_TIMESTAMP
     - docker build -t $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 . --pull -f Dockerfile --platform linux/amd64
     - docker push $CI_REGISTRY_IMAGE:$FULLVERSION
   only:
@@ -28,6 +30,7 @@ build-master-x86:
 build-master-arm64:
   stage: build
   script:
+    - FULLVERSION=$BASEVERSION.$CI_TIMESTAMP
     - docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 .
     - docker push $CI_REGISTRY_IMAGE:$FULLVERSION
   only:
@@ -38,6 +41,7 @@ build-master-arm64:
 build-manifest:
   stage: build
   script:
+    - FULLVERSION=$BASEVERSION.$CI_TIMESTAMP
     - docker manifest create $CI_REGISTRY_IMAGE:$FULLVERSION
       $CI_REGISTRY_IMAGE:$FULLVERSION-amd64
       $CI_REGISTRY_IMAGE:$FULLVERSION-arm64