dockerfile

.gitlab-ci.yml

 stages:
   - build
-  - combine
   - deploy
 variables:
   GIT_DEPTH: "1"
-  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-  CONTAINER_TEST_ARM_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
-  CONTAINER_TEST_X86_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
-  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
 
 build_package:
   stage: build
@@ -26,56 +21,51 @@ build_package:
   tags:
     - docker
 
-build-x86:
+.build-image:
   extends: .docker_op
   stage: build
   script:
-    - TARGET_IMAGE=$CONTAINER_TEST_X86_IMAGE
     - 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-arm:
-  extends: .docker_op
-  stage: build
+  extends: .build-image
   tags:
     - docker-arm
-  script:
-    - TARGET_IMAGE=$CONTAINER_TEST_ARM_IMAGE
-    - docker build --pull -t $TARGET_IMAGE .
-    - docker push $TARGET_IMAGE
-combine:
+  variables:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
+
+.deploy:
   extends: .docker_op
-  stage: combine
+  stage: deploy
+  tags:
+    - docker
   script:
-    - TARGET_IMAGE=$CONTAINER_TEST_IMAGE
-    - SOURCE_IMAGE_2=$CONTAINER_TEST_ARM_IMAGE
-    - SOURCE_IMAGE_1=$CONTAINER_TEST_X86_IMAGE
-    - docker pull $SOURCE_IMAGE_1
-    - docker pull $SOURCE_IMAGE_2
-    - docker manifest create $TARGET_IMAGE --amend $SOURCE_IMAGE_1 --amend
-      $SOURCE_IMAGE_2
+    - 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: .docker_op
-  stage: deploy
-  script:
-    - TARGET_IMAGE=$CONTAINER_RELEASE_IMAGE
-    - SOURCE_IMAGE=$CONTAINER_TEST_IMAGE
-    - docker pull $SOURCE_IMAGE
-    - docker tag $SOURCE_IMAGE $TARGET_IMAGE
-    - docker push $TARGET_IMAGE
+  extends: .deploy
+  variables:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:latest
   only:
     - master
-deploy_tag:
-  extends: .docker_op
-  stage: deploy
-  script:
-    - TARGET_IMAGE=$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-    - SOURCE_IMAGE=$CONTAINER_TEST_IMAGE
-    - docker pull $SOURCE_IMAGE
-    - docker tag $SOURCE_IMAGE $TARGET_IMAGE
-    - docker push $TARGET_IMAGE
-  only:
-    - tags
+
+deploy_branch:
+  extends: .deploy
+  variables:
+    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
 
 deploy_npm:
   stage: deploy