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:
+  BASEVERSION: 1.0
+  DATAVERSION: $(date +%Y%m%d%H%M)
+  FULLVERSION: $BASEVERSION.$DATAVERSION
   CI_REGISTRY_IMAGE: k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo
 
 image: docker:latest
@@ -11,33 +14,35 @@ services:
 before_script:
   - echo $CI_REGISTRY_IMAGE
   - echo $CI_COMMIT_REF_SLUG
+  - echo $FULLVERSION
   - docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 build-master-x86:
   stage: build
   script:
-    - docker build --pull -t $CI_REGISTRY_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE
+    - docker build --platform linux/amd64 --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 .
+    - docker push $CI_REGISTRY_IMAGE:$FULLVERSION
   only:
     - master
   tags:
-    - linux-x86
+    - amd64
 
-build-master-aarch64:
+build-master-arm64:
   stage: build
   script:
-    - docker build --pull -t $CI_REGISTRY_IMAGE .
-    - docker push $CI_REGISTRY_IMAGE
+    - docker build --platform linux/arm64 --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 .
+    - docker push $CI_REGISTRY_IMAGE:$FULLVERSION
   only:
     - master
   tags:
-    - aarch64
-
-#build:
-#  stage: build
-#  script:
-#    - docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
-#    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-#  except:
-#    - master
+    - arm64
 
+merge:manifest:
+  stage: manifest
+  needs: ["build-master-x86", "build-master-arm64"]
+  tags: [x86]
+  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