Merge branch 'prod' into 'master'

Prod See merge request documentale/sprint-flows!481
consiglionazionaledellericerche · Jan 13, 2020 · 9edf225 · 9edf225
2 parents a30e596 + 1e7c6e5
commit 9edf225
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -44,8 +44,9 @@ deploy_snapshot:
   only:
     - test
     - demo
+    - prod
   script:
-    - mvn -B clean compile package deploy -DskipTests -Pprod
+    - mvn -B clean compile package -DskipTests -Pprod
     - cp ./target/*.war ./target/app.war
 
 buildtestcontainer:
@@ -111,9 +112,7 @@ buildprodcontainer:
   tags:
     - shared
   only:
-    - /^(\d+\.)?(\d+\.)?(\*|\d+)$/
-  except:
-    - branches
+    - prod
   script:
     - echo "Running build image and push image for release tag"
     - echo $CI_COMMIT_REF_NAME
@@ -127,28 +126,25 @@ buildprodcontainer:
     - docker push $DOCKER_HUB_ORGANIZATION/$CI_PROJECT_NAME:latest
 
 
-
 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: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
     - 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"
-    - 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"
@@ -160,9 +156,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"
@@ -173,11 +169,13 @@ 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 "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"
     - sshremote $SSH_CONNECT_DOCPROD02 "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"
   environment:
     name: dockprod02
     url: http://dockprod02.cedrc.cnr.it:1480
+
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -3,6 +3,8 @@ 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