Build images using buildx plugin and automatically push on main branch

.gitlab/ci/gitlab.images.yml

@@ -1,5 +1,8 @@
 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
-.gitlab-matrix:
+gitlab:
+  extends:
+    - .build_and_push
+  stage: deploy-gitlab
   variables:
     LFS: '2.9'
     YARN: '1.22'
@@ -13,21 +16,13 @@
         GOLANG: ['1.16', '1.17']
         NODE: ['16.14']
         CHROME: ['94', '99']
-
-gitlab test:
-  extends:
-    - .gitlab-matrix
-    - .test_custom
-
-gitlab push:
-  extends:
-    - .gitlab-matrix
-    - .build_and_deploy_custom
-  stage: deploy-gitlab
-  needs: ["gitlab test"]
+  
 
 # Used by GitLab's compile-production-assets and compile-test-assets jobs
-.gitlab-assets-matrix:
+gitlab-assets:
+  extends:
+    - .build_and_push
+  stage: deploy-gitlab-assets
   variables:
     LFS: '2.9'
     YARN: '1.22'
@@ -38,15 +33,3 @@ gitlab push:
         RUBY: ['2.7', '3.0']
         GIT: ['2.33']
         NODE: ['16.14']
-
-gitlab-assets test:
-  extends:
-    - .gitlab-assets-matrix
-    - .test_custom
-
-gitlab-assets push:
-  extends:
-    - .gitlab-assets-matrix
-    - .build_and_deploy_custom
-  stage: deploy-gitlab-assets
-  needs: ["gitlab-assets test"]