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

---
 .gitlab-ci.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55660b4..032a849 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,11 @@ variables:
 build-job:       # Building jar file
   image: maven:3.6.3-jdk-11-slim
   stage: build
+  variables:
+    MAVEN_OPTS: "-Dmaven.repo.local=${CI_PROJECT_DIR}/.repository/"
+  cache:
+    key: maven
+    paths: [.repository/]
   script:
     - mvn clean install -DskipTests && mvn package -B -e -DskipTests
     - export
@@ -39,7 +44,7 @@ publish-job:       # Building docker image and publishing it
     - docker:dind
   script:
     - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW
-    - docker build -t $DOCKER_URL/$TAG_LATEST .
+    - 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
@@ -59,4 +64,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 PROJEKTNAME_UNIQUE='$Project_name:$CI_JOB_ID' -e PROJEKTNAME='$Project_name' -e HOSTNAME=$EUREKA_HOSTNAME -e EUREKAPORT=$EUREKA_PORT -e server.port=$CONFIG_PORT -e CONFIGPORT=$CONFIG_PORT -e KEY='$CONFIG_KEY' -e CONFIGURL='$CONFIG_URL' -e CONFIGUSER='$CONFIG_USER' -e CONFIGHTTP=$CONFIG_HTTP -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST"
+    - ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -e spring.config.import='configserver:$CONFIG_HTTP://$CONFIG_USER$CONFIG_URL/todo-config' -e PROJEKTNAME_UNIQUE='$Project_name:$CI_JOB_ID' -e PROJEKTNAME='$Project_name' -e HOSTNAME=$EUREKA_HOSTNAME -e EUREKAPORT=$EUREKA_PORT -e server.port=$PORT_CONTAINER -e CONFIGPORT=$CONFIG_PORT -e KEY='$CONFIG_KEY' -e CONFIGURL='$CONFIG_URL' -e CONFIGUSER='$CONFIG_USER' -e CONFIGHTTP=$CONFIG_HTTP -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST"