From 098dabb31b2f08bead3f36b9e534c00b9b81d493 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Fri, 6 May 2022 23:10:44 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0084212..340e767 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,10 @@ stages:          # List of stages for jobs, and their order of execution
 
 
 variables:
+  FF_USE_FASTZIP: "true"
+  # These can be specified per job or per pipeline
+  ARTIFACT_COMPRESSION_LEVEL: "fast"
+  CACHE_COMPRESSION_LEVEL: "fast"
   CI_REGISTRY_IMAGE: docker.dergeorg.at/dergeorg
   SERVICE: todo-frontend
   Docker_name:  gitlab-todo-frontend
@@ -14,7 +18,7 @@ variables:
   Docker_namespace:  dergeorg
   DOCKER_TAG:  latest
   ENV: test
-  PORT_HOST: 9998
+  PORT_HOST: 8889
   PORT_CONTAINER: 80
   EUREKA_HOSTNAME: 192.168.1.65
   EUREKA_PORT: 9995
@@ -22,16 +26,27 @@ variables:
   CONFIG_URL: service.todo.gitlab.dergeorg.at
   CONFIG_HTTP: https
 
+cache:
+  policy: pull-push
+  key: NPM_DOWNLOAD_CACHE
+  paths:
+    - .npm/
+
 build-job:       # Building jar file
-  image: nginx:1.17.1-alpine
+  image: node:lts-alpine
   stage: build
   script:
+    - ls src/environments/
+    - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.ts
     - echo "$APPLICATION_TODO_FRONTEND_TS" > src/environments/environment.prod.ts
-    - npm install
-    - npm run build
+    - npm ci --cache .npm --prefer-offline
+    - npm install -g @angular/cli
+    - ng build --prod 
+    - ls
   artifacts:
     paths:
-      - target/*.jar
+      - dist/
+
 
 publish-job:       # Building docker image and publishing it
   image: docker:latest
@@ -39,8 +54,8 @@ publish-job:       # Building docker image and publishing it
   services:
     - docker:dind
   script:
-    - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW
-    - docker build -t $DOCKER_URL/$TAG_LATEST .
+    - docker login -u $DOCKER_USER -p $DOCKER_PW $DOCKER_URL 
+    - docker build -t $DOCKER_URL/$TAG_LATEST --cache-from $DOCKER_URL/$TAG_LATEST .
     - docker push $DOCKER_URL/$TAG_LATEST
 
 deploy-job:      # Deploy docker image on ssh server
@@ -60,4 +75,4 @@ deploy-job:      # Deploy docker image on ssh server
     - ssh $SSH_USER@$SERVER_IP "docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW"
     - ssh $SSH_USER@$SERVER_IP "docker push $DOCKER_URL/$TAG_LATEST"
     - ssh $SSH_USER@$SERVER_IP "docker container rm -f $Docker_name || true"
-    - ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -e -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST"
+    - ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST"