chore(docker): undo multistage builds stuff

gitlab-ci/build-image.yml

@@ -25,13 +25,11 @@ build_image:
     - 'if [ ! -z "$CI_COMMIT_TAG" ]; then export BBK_RUNTIME_ENVIRONMENT=production; fi'
 
     # Output environment for easier debugging
-    - 'echo BBK_RUNTIME_ENVIRONMENT: $BBK_RUNTIME_ENVIRONMENT'
+    - "echo BBK_RUNTIME_ENVIRONMENT: $BBK_RUNTIME_ENVIRONMENT"
 
     # Build and push image
-    - docker pull $CI_REGISTRY_IMAGE:$TAG-builder || true
-    - docker build --cache-from $CI_REGISTRY_IMAGE:$TAG-builder --tag $CI_REGISTRY_IMAGE:$TAG-builder --target build .
-    - docker build --cache-from $CI_REGISTRY_IMAGE:$TAG-builder --tag $CI_REGISTRY_IMAGE:$TAG .
-    - docker push $CI_REGISTRY_IMAGE:$TAG-builder
+    - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG || true
+    - docker build --cache-from $CI_REGISTRY_IMAGE:$TAG --tag $CI_REGISTRY_IMAGE:$TAG --build-arg BBK_RUNTIME_ENVIRONMENT=${BBK_RUNTIME_ENVIRONMENT} --build-arg COMMIT_SHA=$CI_COMMIT_SHORT_SHA .
     - docker push $CI_REGISTRY_IMAGE:$TAG
   except:
     refs:
@@ -41,4 +39,11 @@ build_image:
       - $CI_COMMIT_MESSAGE =~ /\[ci-release\]/
   tags:
     - docker
-  cache: {}
+  # skip artifacts and cache download for this job
+  dependencies: []
+  cache:
+    key: $CI_COMMIT_REF_SLUG
+    paths:
+      - node_modules/
+      - cache/Cypress
+    policy: pull