From cbf15441cd5c6fec583b902caf837a64a7417169 Mon Sep 17 00:00:00 2001
From: Marcin Ireneusz Trycz <marcinireneusz.trycz@cnr.it>
Date: Mon, 16 Dec 2019 09:26:45 +0100
Subject: [PATCH 01/12] Derompo il prod

---
 .gitlab-ci.yml             | 20 ++++++++------------
 src/main/docker/Dockerfile |  5 +++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e72f14a9..5f5435104 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,33 +111,29 @@ buildprodcontainer:
   tags:
     - shared
   only:
-    - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-  except:
-    - branches
+    - prod
   script:
     - echo "Running build image and push image for latest release"
     - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows  .
     - docker push docker.si.cnr.it/sprint-flows
     - echo "Running build image and push image for release tag"
     - echo $CI_COMMIT_TAG
-    - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows:$CI_COMMIT_TAG .
-    - docker push docker.si.cnr.it/sprint-flows:$CI_COMMIT_TAG
+    - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows:1.0.8 .
+    - docker push docker.si.cnr.it/sprint-flows:1.0.8
 
 
 deploydockprod01:
   stage: deploy_prod_container
   image: scolagreco/alpine-ssh:latest
   only:
-    - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-  except:
-    - branches
+    - prod
   tags:
     - shared
   when: manual
   script:
     - echo "Deploy sprint-flows to dockprod01"
     - echo "setting secrets"
-    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:$CI_COMMIT_TAG/g" ./src/main/docker/app-prod.yml
+    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:1.0.8/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_DATASOURCE_PASSWORD_SED/$POSTGRESS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_LDAP_MANAGERPASSWORD_SED/$LDAP_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
@@ -156,9 +152,9 @@ deploydockprod02:
   stage: deploy_prod_container
   image: scolagreco/alpine-ssh:latest
   only:
-    - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-  except:
-    - branches
+    - prod
+  tags:
+    - shared
   when: manual
   script:
     - echo "Deploy sprint-flows to dockprod02"
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 4c7e5d30e..7935bc8e9 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -3,12 +3,13 @@ FROM scolagreco/alpine-openjdk:v3.9.2
 VOLUME /tmp
 
 RUN apk add --update --no-cache ttf-dejavu curl
+ARG JAR_FILE=./target/app.war
+ADD ${JAR_FILE} /opt/app.war
 
 EXPOSE 8080
 
 WORKDIR /opt/
 
 # https://spring.io/guides/gs/spring-boot-docker/#_containerize_it
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/opt/app.war"]
 
-RUN curl -L "http://maven.si.cnr.it/service/local/artifact/maven/redirect?r=public&g=it.cnr.si.flows&a=sprint-flows&v=LATEST&e=war" --output /opt/app.war
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom", "-jar","/opt/app.war" ]
\ No newline at end of file

From 1d39ccb43038114f836298d34ac981014b1fa887 Mon Sep 17 00:00:00 2001
From: Marcin Ireneusz Trycz <marcinireneusz.trycz@cnr.it>
Date: Mon, 16 Dec 2019 09:27:52 +0100
Subject: [PATCH 02/12] Derompo il prod

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f5435104..9dc0c9c37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,6 +113,7 @@ buildprodcontainer:
   only:
     - prod
   script:
+    - mvn clean package -B -Pprod -DskipTests
     - echo "Running build image and push image for latest release"
     - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows  .
     - docker push docker.si.cnr.it/sprint-flows

From 279eec4065c9db78e818338b5b805197f4d7e0dd Mon Sep 17 00:00:00 2001
From: Marcin Ireneusz Trycz <marcinireneusz.trycz@cnr.it>
Date: Mon, 16 Dec 2019 09:28:59 +0100
Subject: [PATCH 03/12] Derompo il prod

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dc0c9c37..979363f3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,7 @@ deploy_snapshot:
   only:
     - test
     - demo
+    - prod
   script:
     - mvn -B clean compile package deploy -DskipTests -Pprod
     - cp ./target/*.war ./target/app.war
@@ -113,7 +114,6 @@ buildprodcontainer:
   only:
     - prod
   script:
-    - mvn clean package -B -Pprod -DskipTests
     - echo "Running build image and push image for latest release"
     - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows  .
     - docker push docker.si.cnr.it/sprint-flows

From f87947ea5e09b4f0d337c606b018242271e2ef34 Mon Sep 17 00:00:00 2001
From: Marcin Ireneusz Trycz <marcinireneusz.trycz@cnr.it>
Date: Mon, 16 Dec 2019 09:32:55 +0100
Subject: [PATCH 04/12] Derompo il prod

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ff33d13bd..472507537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -760,7 +760,7 @@
                                 </goals>
                                 <configuration>
                                     <nodeVersion>v6.17.1</nodeVersion>
-                                    <npmVersion>3.10.5</npmVersion>
+                                    <npmVersion>3.10.10</npmVersion>
                                 </configuration>
                             </execution>
                             <execution>

From 9a5b844b14189d457b078442c571731dae8e2975 Mon Sep 17 00:00:00 2001
From: Marcin Ireneusz Trycz <marcinireneusz.trycz@cnr.it>
Date: Mon, 16 Dec 2019 09:40:51 +0100
Subject: [PATCH 05/12] Derompo il prod

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 979363f3c..fd70fd85f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ deploy_snapshot:
     - demo
     - prod
   script:
-    - mvn -B clean compile package deploy -DskipTests -Pprod
+    - mvn -B compile package -DskipTests -Pprod
     - cp ./target/*.war ./target/app.war
 
 buildtestcontainer:

From 6fe2916efe53ed9418df59195bd76d72e6baabea Mon Sep 17 00:00:00 2001
From: TRYCZ MARCINIRENEUSZ <marcinireneusz.trycz@cnr.it>
Date: Thu, 9 Jan 2020 09:58:43 +0000
Subject: [PATCH 06/12] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd70fd85f..e8efef4d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,8 +119,8 @@ buildprodcontainer:
     - docker push docker.si.cnr.it/sprint-flows
     - echo "Running build image and push image for release tag"
     - echo $CI_COMMIT_TAG
-    - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows:1.0.8 .
-    - docker push docker.si.cnr.it/sprint-flows:1.0.8
+    - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows:1.0.24 .
+    - docker push docker.si.cnr.it/sprint-flows:1.0.24
 
 
 deploydockprod01:
@@ -134,7 +134,7 @@ deploydockprod01:
   script:
     - echo "Deploy sprint-flows to dockprod01"
     - echo "setting secrets"
-    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:1.0.8/g" ./src/main/docker/app-prod.yml
+    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:1.0.24/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_DATASOURCE_PASSWORD_SED/$POSTGRESS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_LDAP_MANAGERPASSWORD_SED/$LDAP_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml

From 7dc18cc85f481951f95d61c5242fd3b95bff9ae2 Mon Sep 17 00:00:00 2001
From: Marcin Ireneusz Trycz <marcinireneusz.trycz@cnr.it>
Date: Thu, 9 Jan 2020 11:14:18 +0100
Subject: [PATCH 07/12] Derompo Abil

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8efef4d9..9624faef1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,8 +119,8 @@ buildprodcontainer:
     - docker push docker.si.cnr.it/sprint-flows
     - echo "Running build image and push image for release tag"
     - echo $CI_COMMIT_TAG
-    - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows:1.0.24 .
-    - docker push docker.si.cnr.it/sprint-flows:1.0.24
+    - docker build --file src/main/docker/Dockerfile -t docker.si.cnr.it/sprint-flows .
+    - docker push docker.si.cnr.it/sprint-flows
 
 
 deploydockprod01:
@@ -134,7 +134,7 @@ deploydockprod01:
   script:
     - echo "Deploy sprint-flows to dockprod01"
     - echo "setting secrets"
-    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:1.0.24/g" ./src/main/docker/app-prod.yml
+    - sed -i "s/docker.si.cnr.it\/sprint-flows/docker.si.cnr.it\/sprint-flows:latest/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_DATASOURCE_PASSWORD_SED/$POSTGRESS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/SPRING_LDAP_MANAGERPASSWORD_SED/$LDAP_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml

From 981d1bbba574c1ddc92c6698c702d09cae35a97d Mon Sep 17 00:00:00 2001
From: TRYCZ MARCINIRENEUSZ <marcinireneusz.trycz@cnr.it>
Date: Thu, 9 Jan 2020 13:06:25 +0000
Subject: [PATCH 08/12] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9624faef1..e719c5808 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,3 +174,4 @@ deploydockprod02:
   environment:
     name: dockprod02
     url: http://dockprod02.cedrc.cnr.it:1480
+

From 9a7df879d0fd467ae1fe11142f1aff15cff7b7b6 Mon Sep 17 00:00:00 2001
From: TRYCZ MARCINIRENEUSZ <marcinireneusz.trycz@cnr.it>
Date: Thu, 9 Jan 2020 13:07:13 +0000
Subject: [PATCH 09/12] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e719c5808..2bade502a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,7 @@ deploydockprod01:
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
-    - sshremote $SSH_CONNECT_DOCPROD01 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
+    - sshremote $SSH_CONNECT_DOCPROD01 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
     - echo "copying docker-compose file"
     - scpremote ./src/main/docker/app-prod.yml $SSH_CONNECT_DOCPROD01:/sites/docker-flows/app.yml
     - echo "starting service"
@@ -166,7 +166,7 @@ deploydockprod02:
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
-    - sshremote $SSH_CONNECT_DOCPROD02 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
+    - sshremote $SSH_CONNECT_DOCPROD02 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
     - echo "copying docker-compose file"
     - scpremote ./src/main/docker/app-prod.yml $SSH_CONNECT_DOCPROD02:/sites/docker-flows/app.yml
     - echo "starting services"

From 4a9f7a8d025aa609c00b16521812ead4c571e1ec Mon Sep 17 00:00:00 2001
From: TRYCZ MARCINIRENEUSZ <marcinireneusz.trycz@cnr.it>
Date: Thu, 9 Jan 2020 13:23:27 +0000
Subject: [PATCH 10/12] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bade502a..289654094 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ services:
   - docker:dind
 
 cache:
-  key: $CI_COMMIT_REF_NAME
+  key: $CI_COMMIT_SHORT_SHA
   paths:
     - .m2/repository/
     - ~/.npm

From 1df0975576f5a91f903f4fb96ff1a644a056f059 Mon Sep 17 00:00:00 2001
From: TRYCZ MARCINIRENEUSZ <marcinireneusz.trycz@cnr.it>
Date: Thu, 9 Jan 2020 13:59:39 +0000
Subject: [PATCH 11/12] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 289654094..f6e5c3642 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ services:
   - docker:dind
 
 cache:
-  key: $CI_COMMIT_SHORT_SHA
+  key: $CI_COMMIT_REF_NAME
   paths:
     - .m2/repository/
     - ~/.npm
@@ -46,7 +46,7 @@ deploy_snapshot:
     - demo
     - prod
   script:
-    - mvn -B compile package -DskipTests -Pprod
+    - mvn -B clean compile package -DskipTests -Pprod
     - cp ./target/*.war ./target/app.war
 
 buildtestcontainer:

From 415ba39510bdc8ec7e9050ed72b0ced2b77996bd Mon Sep 17 00:00:00 2001
From: TRYCZ MARCINIRENEUSZ <marcinireneusz.trycz@cnr.it>
Date: Thu, 9 Jan 2020 14:30:20 +0000
Subject: [PATCH 12/12] Update .gitlab-ci.yml

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6e5c3642..b58d44e55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,8 +140,8 @@ deploydockprod01:
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
-    - sshremote $SSH_CONNECT_DOCPROD01 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
-    - echo "copying docker-compose file"
+    - sshremote $SSH_CONNECT_DOCPROD01 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans || echo NOFILE"
+    - sshremote $SSH_CONNECT_DOCPROD01 "rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/"    - echo "copying docker-compose file"
     - scpremote ./src/main/docker/app-prod.yml $SSH_CONNECT_DOCPROD01:/sites/docker-flows/app.yml
     - echo "starting service"
     - sshremote $SSH_CONNECT_DOCPROD01 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml pull && docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml up -d"
@@ -166,7 +166,8 @@ deploydockprod02:
     - sed -i "s/ACE_PASSWORD_SED/$ACE_PASSWORD/g" ./src/main/docker/app-prod.yml
     - sed -i "s/CMIS_PASSWORD/$CMIS_PASSWORD/g" ./src/main/docker/app-prod.yml
     - echo "stopping service"
-    - sshremote $SSH_CONNECT_DOCPROD02 "if [ -f  ''/sites/docker-flows/app.yml'' ]; then docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans; fi && rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/ || echo NODIR"
+    - sshremote $SSH_CONNECT_DOCPROD02 "docker-compose -p $CI_PROJECT_NAME -f /sites/docker-flows/app.yml down -v --remove-orphans || echo NOFILE"
+    - sshremote $SSH_CONNECT_DOCPROD02 "rm -rf /sites/docker-flows/ && mkdir -p /sites/docker-flows/"
     - echo "copying docker-compose file"
     - scpremote ./src/main/docker/app-prod.yml $SSH_CONNECT_DOCPROD02:/sites/docker-flows/app.yml
     - echo "starting services"