Tasks extensions

.gitlab-ci.yml

@@ -18,8 +18,7 @@ variables:
 #    - docker build --pull -t $CONTAINER_TEST_IMAGE -f Dockerfile .
 #    - docker push $CONTAINER_TEST_IMAGE
 
-b:docker:
-  stage: build
+.build-image:
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
@@ -30,17 +29,19 @@ b:docker:
       /kaniko/executor
       --context "${CI_PROJECT_DIR}"
       --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
-      --destination "${CONTAINER_TEST_IMAGE}"
+      --destination "${DESTINATION}"
+
+b:docker:
+  extends: .build-image
+  stage: build
+  variables:
+    DESTINATION: $CONTAINER_TEST_IMAGE
 
 r:docker:
+  extends: .build-image
   stage: release
-  image: docker:20.10
-  services:
-    - docker:20.10-dind
-  script:
-    - docker pull $CONTAINER_TEST_IMAGE
-    - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
-    - docker push $CONTAINER_RELEASE_IMAGE
+  variables:
+    DESTINATION: $CONTAINER_RELEASE_IMAGE
   only:
     - master