ci

.gitlab-ci.yml

 stages:
   - build
-
+  - deploy
 variables:
   GIT_DEPTH: "1"
 
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
-build:
+.build-image:
   stage: build
-  tags: 
-    - vs
   script:
-    - cd 1-chocolatey
-    - docker build --pull -t ${env:CI_REGISTRY_IMAGE}:choco .
-    - docker tag ${env:CI_REGISTRY_IMAGE}:choco ${env:CI_REGISTRY_IMAGE}:latest
-    - cd ../2-node
-    - docker build -t ${env:CI_REGISTRY_IMAGE}:node .
-    - docker push ${env:CI_REGISTRY_IMAGE}:choco
-    - docker push ${env:CI_REGISTRY_IMAGE}:latest
-    - docker push ${env:CI_REGISTRY_IMAGE}:node
+    - docker build --pull -t $TARGET_IMAGE .
+    - docker push $TARGET_IMAGE
+
+build-x86:
+  extends: .build-image
+  tags:
+    - docker
+  variables:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
+
+build-x86:
+  extends: .build-image
+  tags:
+    - docker-arm
+  variables:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
+
+.deploy:
+  stage: deploy
+  tags:
+    - docker
+  script:
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
+    - docker manifest create $TARGET_IMAGE --amend $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86 --amend
+      $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
+    - docker manifest push $TARGET_IMAGE
+
+deploy_latest:
+  extends: .deploy
+  vars:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:latest
   only:
-    - main
+    - master
+
+deploy_branch:
+  extends: .deploy
+  vars:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG