Merge remote branch 'dashboard-backend/move-everything-to-backend-folder' into 71-merge-dashboard-and-dashboard-backend-repos

.gitlab-ci.yml

@@ -14,7 +14,6 @@ image: node:14-alpine
 variables:
   CHART_NAME: stackspin-dashboard
   CHART_DIR: deployment/helmchart/
-  KANIKO_BUILD_IMAGENAME: dashboard
 
 build-project:
   stage: build-project
@@ -33,16 +32,38 @@ build-project:
     paths:
       - web-build
 
-build-container:
+.kaniko-build:
+  script:
+    - cd ${DIRECTORY}
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - export CONTAINER_TAG=${CI_COMMIT_TAG:-${CI_COMMIT_REF_SLUG}}
+    - /kaniko/executor --cache=true --context ${CI_PROJECT_DIR}/${DIRECTORY} --destination ${CI_REGISTRY_IMAGE}/${KANIKO_BUILD_IMAGENAME}:${CONTAINER_TAG}
+
+build-fontend-container:
   stage: build-container
   image:
     # We need a shell to provide the registry credentials, so we need to use the
     # kaniko debug image (https://github.com/GoogleContainerTools/kaniko#debug-image)
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
-  script:
-    - cp deployment/Dockerfile web-build
-    - cp deployment/nginx.conf web-build
-    - cd web-build
-    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --cache=true --context ${CI_PROJECT_DIR}/web-build --destination ${CI_REGISTRY_IMAGE}/${KANIKO_BUILD_IMAGENAME}:${CI_COMMIT_REF_SLUG}
+  variables:
+    KANIKO_BUILD_IMAGENAME: dashboard
+    DIRECTORY: web-build
+  before_script:
+    - cp deployment/Dockerfile $DIRECTORY
+    - cp deployment/nginx.conf $DIRECTORY
+  extends:
+    .kaniko-build
+
+build-backend-container:
+  stage: build-container
+  variables:
+    KANIKO_BUILD_IMAGENAME: dashboard-backend
+    DIRECTORY: backend
+  image:
+    # We need a shell to provide the registry credentials, so we need to use the
+    # kaniko debug image (https://github.com/GoogleContainerTools/kaniko#debug-image)
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  extends:
+    .kaniko-build