Update build stages

* Show stage in job definition
* Remove verbose .container-build job definition

.gitlab-ci.yml

@@ -74,6 +74,8 @@ warmup:
 
 # Kaniko build setup
 .build:
+  extends:
+    - .default-rules
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
@@ -91,11 +93,6 @@ warmup:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"https://index.docker.io/v1/\":{\"username\":\"$DOCKER_HUB_USER\",\"password\":\"$DOCKER_HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - echo "{\"tag\":\"$CI_COMMIT_TAG\",\"commit\":\"$CI_COMMIT_SHA\",\"branch\":\"$CI_COMMIT_BRANCH\",\"ci\":true}" > src/version.json
 
-.container-build:
-  extends:
-    - .build
-    - .default-rules
-  stage: build
 
 generate_css:
   extends:
@@ -215,7 +212,9 @@ django-tests:
         path: .tools/coverage/coverage.xml
 
 build_test:
-  extends: .container-build
+  stage: build
+  extends:
+    - .build
   needs:
     - generate_css
     - migration_check
@@ -228,7 +227,9 @@ build_test:
         --destination $CI_REGISTRY_IMAGE/ci/hub:ci-$CI_PIPELINE_ID-test
 
 build_nginx:
-  extends: .container-build
+  stage: build
+  extends:
+    - .build
   needs:
     - generate_css
     - migration_check
@@ -242,7 +243,9 @@ build_nginx:
         --destination $CI_REGISTRY_IMAGE/ci/nginx:ci-$CI_PIPELINE_ID
 
 build_release:
-  extends: .container-build
+  stage: build
+  extends:
+    - .build
   needs:
     - generate_css
     - migration_check