From 852c28dc2723f3ef991b6fb780aa774ced37c64c Mon Sep 17 00:00:00 2001
From: M9713 <m9713@student.jamk.fi>
Date: Mon, 8 Nov 2021 20:36:18 +0200
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03e6582..ae575dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,11 +13,11 @@ build:
  
   script:
 
-#  # Build Backend
-#   
-#    - echo "Building Backend"
-#    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-#    - /kaniko/executor --context $CI_PROJECT_DIR/conduit-backend --dockerfile $CI_PROJECT_DIR/conduit-backend/Dockerfile --destination $CI_REGISTRY_IMAGE:backend
+  # Build Backend
+   
+    - echo "Building Backend"
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR/conduit-backend --dockerfile $CI_PROJECT_DIR/conduit-backend/Dockerfile --destination $CI_REGISTRY_IMAGE:backend
   
   # Build Frontend
 
@@ -42,9 +42,9 @@ deploy:
          - kubectl -n default rollout restart deployment backend   
 
 
-#    script: echo "Deploying Frontend"
-#    image: bitnami/kubectl:latest
-#    script:
-#         - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-service.yaml
-#         - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-deployment.yaml
-#         - kubectl -n default rollout restart deployment front 
+    script: echo "Deploying Frontend"
+    image: bitnami/kubectl:latest
+    script:
+         - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-service.yaml
+         - kubectl apply -f $CI_PROJECT_DIR/conduit-front/front-deployment.yaml
+         - kubectl -n default rollout restart deployment front 
-- 
GitLab