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

.gitlab-ci.yml

@@ -21,30 +21,18 @@ before_script:
   - REGISTRY_IMAGE=$CI_REGISTRY_IMAGE:$FULLVERSION
   - echo "$CI_REGISTRY_PASSWORD" | docker login --username 'tcr$eoc' --password-stdin $CI_REGISTRY
 
-build-master-x86:
+build-master:
   stage: build
   script:
     - docker build -t $CI_REGISTRY_IMAGE:$FULLVERSION-amd64 . --pull -f Dockerfile --platform linux/amd64
     - docker push $CI_REGISTRY_IMAGE:$FULLVERSION-amd64
-  only:
-    - master
-  tags:
-    - amd64
 
-build-master-arm64:
-  stage: build
-  script:
     - docker build -t $CI_REGISTRY_IMAGE:$FULLVERSION-arm64 . --pull -f Dockerfile --platform linux/arm64
     - docker push $CI_REGISTRY_IMAGE:$FULLVERSION-arm64
-  only:
-    - master
-  tags:
-    - arm64
 
-build-manifest:
-  stage: build
-  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
   only:
     - master
+  tags:
+    - amd64