rev

.gitlab-ci.yml

 stages:
   - build
   - deploy
+
 variables:
   GIT_DEPTH: "1"
+  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
+  DOCKER_CLI_EXPERIMENTAL: enabled
 
 before_script:
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
-.build-image:
+build:
   stage: build
-  script:
-    - 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: .build-image
-  tags:
-    - docker-arm
-  variables:
-    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
-
-.deploy:
-  stage: deploy
-  tags:
+  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
-  variables:
-    TARGET_IMAGE: $CI_REGISTRY_IMAGE:latest
+    - docker run --privileged --rm tonistiigi/binfmt --install all
+    - mkdir -p ~/.docker/cli-plugins
+    - wget -O ~/.docker/cli-plugins/docker-buildx 'https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64'
+    - chmod a+x ~/.docker/cli-plugins/docker-buildx
+    - docker buildx create --use
+    - docker buildx build --platform linux/amd64,linux/arm64/v8 --push --pull -t $CONTAINER_RELEASE_IMAGE .
   only:
     - master
-
-deploy_branch:
-  extends: .deploy
-  variables:
-    TARGET_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG