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

.gitlab-ci.yml

@@ -2,7 +2,8 @@
 # Official docker image.
 variables:
   BASE_VERSION: "1.0"
-  IMAGE_NAME: "dotnet-cicd-demo"
+  USER_NAME: "tcr$eoc"
+  CI_REGISTRY: "k8s-t0.tencentcloudcr.com"
   CI_REGISTRY_IMAGE: "k8s-t0.tencentcloudcr.com/eoc/dotnet-cicd-demo"
 
 image: docker:latest
@@ -12,11 +13,13 @@ services:
 
 before_script:
   - echo "$CI_REGISTRY_IMAGE"
-  - echo "$CI_COMMIT_REF_SLUG"
+
   - FULLVERSION=$BASE_VERSION.$(date +"%y%m%d%H%M")
   - export FULLVERSION
   - echo $FULLVERSION
-  - docker login -u 'tcr$eoc' -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  
+  - REGISTRY_IMAGE=$CI_REGISTRY_IMAGE:$FULLVERSION
+  - docker login -u $USER_NAME -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 build-master-x86:
   stage: build
@@ -31,7 +34,7 @@ build-master-x86:
 build-master-arm64:
   stage: build
   script:
-    - docker build --pull -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 .
+    - docker build -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 . --pull -f Dockerfile --platform linux/amd64
     - docker push $CI_REGISTRY_IMAGE:$FULLVERSION-arm64
   only:
     - master
@@ -47,4 +50,3 @@ build-manifest:
     - docker manifest push $CI_REGISTRY_IMAGE:$FULLVERSION
   only:
     - master
-