From f57e33ac10fae4d90d1799a721e621428f0b50a2 Mon Sep 17 00:00:00 2001 From: Marcin Ireneusz Trycz Date: Mon, 16 Dec 2019 09:26:45 +0100 Subject: [PATCH 01/13] Derompo il prod --- .gitlab-ci.yml | 20 +-- src/main/docker/Dockerfile | 5 +- .../resources/config/application-demo.yml | 88 +++++++++ src/main/resources/config/application-dev.yml | 80 +++++++++ .../resources/config/application-prod.yml | 51 ++++++ .../resources/config/application-test.yml | 88 +++++++++ src/main/resources/config/application.yml | 170 ++++++++++++++++++ 7 files changed, 488 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/config/application-demo.yml create mode 100644 src/main/resources/config/application-dev.yml create mode 100644 src/main/resources/config/application-prod.yml create mode 100644 src/main/resources/config/application-test.yml create mode 100644 src/main/resources/config/application.yml 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 diff --git a/src/main/resources/config/application-demo.yml b/src/main/resources/config/application-demo.yml new file mode 100644 index 000000000..bdf442207 --- /dev/null +++ b/src/main/resources/config/application-demo.yml @@ -0,0 +1,88 @@ +spring: + ldap: + userSearchBase: o=cnr, c=it + userSearchFilter: uid={0} + url: ldap://virtest1.si.cnr.it:389 + managerDn: cn=mastercnrapp2,ou=account,o=cnr,c=it + managerPassword: pippa + datasource: + type: com.zaxxer.hikari.HikariDataSource + # l'url del db viene modificata all'avvio dell'applicazione a seconda del profilo (cnr => flows-cnr, + # oiv => flows-oiv) in modo che l'applicazione punti un db diverso a seconda del profilo + url: jdbc:postgresql://localhost:5432/flows + username: activiti + password: activitipw + jpa: + database-platform: it.cnr.si.domain.util.FixedPostgreSQL82Dialect + database: POSTGRESQL + show-sql: false + proxy: + OIL: + username: admin + password: ubiquitous + url: http://helpwildfly.si.cnr.it:8080/rest/ + newProblem: pest + instance: /HDSiper + mail: + url: "https://demoscrivaniadigitale-cnr.si.cnr.it" + +cnr: + firma: + signcertid: AS0 + typeotpauth: firma + url: http://arss.cedrc.cnr.it:8080/ArubaSignService/ArubaSignService?wsdl + pdfprofile: PADESBES + sigla: + usr: app.scrivaniadigitale + psw: bubbazza + coolflows: + username: utente1 + password: HggHjhUIuhedfwUI788yasdfiuh897 +oiv: + baseurl: http://cool-jconon-funzione-pubblica.test.si.cnr.it + esperienza-noncoerente: ${oiv.baseurl}/rest/application-fp/esperienza-noncoerente + ricalcola-fascia: ${oiv.baseurl}/rest/application-fp/applications-ricalcola-fascia + iscrivi-inelenco: ${oiv.baseurl}/rest/application-fp/iscrivi-inelenco + soccorso-istruttorio: ${oiv.baseurl}/rest/application-fp/soccorso-istruttorio + preavviso-rigetto: ${oiv.baseurl}/rest/application-fp/preavviso-rigetto + comunicazioni: ${oiv.baseurl}/rest/application-fp/comunicazioni + usr: admin + psw: admin + mail: + mail.host: servizi.palazzochigi.it + mail.protocol: smtp + mail.port: 587 + mail.user: elenco.oiv + mail.password: elencooiv2016 + mail.send.error.to: massimo.fraticelli@cnr.it + mail.from: no-reply@scrivaniadigitale + + +jhipster: + swagger: + title: sprint API + description: sprint API documentation + version: 0.0.1 + termsOfServiceUrl: + contactName: + contactUrl: + contactEmail: + license: + licenseUrl: +jasper-report: + dir-oiv: /src/main/resources/print/oiv-print/ + dir-cnr: /src/main/resources/print/cnr-print/ + + +ace: + url: "http://acebuntudock.si.cnr.it:5555/api" + username: app.scrivaniadigitale + password: bubbazza + +# TODO: da modificare +#repository: +# base: +# url: http://as1dock.si.cnr.it:8080/alfresco/ + +#cache.hazelcast.port: 5709 +#cache.hazelcast.packages: it.cnr.si \ No newline at end of file diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml new file mode 100644 index 000000000..45fffa65f --- /dev/null +++ b/src/main/resources/config/application-dev.yml @@ -0,0 +1,80 @@ +spring: + ldap: + userSearchBase: o=cnr, c=it + userSearchFilter: uid={0} + url: ldap://virtest1.si.cnr.it:389 + managerDn: cn=mastercnrapp2,ou=account,o=cnr,c=it + managerPassword: pippa + datasource: + type: com.zaxxer.hikari.HikariDataSource + # l'url del db viene modificata all'avvio dell'applicazione a seconda del profilo (cnr => flows-cnr, + # oiv => flows-oiv) in modo che l'applicazione punti un db diverso a seconda del profilo + url: jdbc:h2:file:./DB-H2/flows;DB_CLOSE_DELAY=-1 + username: flows + password: + jpa: + database-platform: it.cnr.si.domain.util.FixedH2Dialect + database: H2 + show-sql: false + proxy: + OIL: + username: admin + password: ubiquitous + url: http://helpwildfly.si.cnr.it:8080/rest/ + newProblem: pest + instance: /HDSiper + mail: + url: localhost:8080 + +cnr: + sigla: + usr: app.scrivaniadigitale + psw: bubbazza + mail: + mail.host: smtp.cnr.it + mail.protocol: smtp + mail.port: 25 + mail.send.error.to: marcinireneusz.trycz@cnr.it + mail.from: no-reply@nuovascrivaniadigitale + abil: + url: http://dockerwebtest01.si.cnr.it:8088/ + +oiv: + baseurl: http://cool-jconon-funzione-pubblica.test.si.cnr.it + esperienza-noncoerente: ${oiv.baseurl}/rest/application-fp/esperienza-noncoerente + ricalcola-fascia: ${oiv.baseurl}/rest/application-fp/applications-ricalcola-fascia + iscrivi-inelenco: ${oiv.baseurl}/rest/application-fp/iscrivi-inelenco + soccorso-istruttorio: ${oiv.baseurl}/rest/application-fp/soccorso-istruttorio + preavviso-rigetto: ${oiv.baseurl}/rest/application-fp/preavviso-rigetto + comunicazioni: ${oiv.baseurl}/rest/application-fp/comunicazioni + usr: admin + psw: admin + mail: + mail.host: servizi.palazzochigi.it + mail.protocol: smtp + mail.port: 587 + mail.user: elenco.oiv + mail.password: elencooiv2016 + mail.send.error.to: massimo.fraticelli@cnr.it + mail.from: no-reply@scrivaniadigitale + + +jhipster: + swagger: + title: sprint API + description: sprint API documentation + version: 0.0.1 + termsOfServiceUrl: + contactName: + contactUrl: + contactEmail: + license: + licenseUrl: +jasper-report: + dir-oiv: /src/main/resources/print/oiv-print/ + dir-cnr: /src/main/resources/print/cnr-print/ + +ace: + url: "http://acebuntudock.si.cnr.it:5555/api" + username: app.scrivaniadigitale + password: bubbazza \ No newline at end of file diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml new file mode 100644 index 000000000..8d12e8075 --- /dev/null +++ b/src/main/resources/config/application-prod.yml @@ -0,0 +1,51 @@ +cache: + hazelcast: + mancenter: + port: 1481 + outboundPort: 1482 + +# inizio credenziali Alfresco +user: + admin: + username: app.scrivaniadigitale + password: +# fine credenziali Alfresco + +repository: + base: + url: https://gestdoc.cnr.it/alfresco/ + +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + # l'url del db viene modificata all'avvio dell'applicazione a seconda del profilo (cnr => flows-cnr, + # oiv => flows-oiv) in modo che l'applicazione punti un db diverso a seconda del profilo + url: jdbc:postgresql://fullhostdb.src.cnr.it:5432/flows + username: flows-cnr + password: + jpa: + database-platform: it.cnr.si.domain.util.FixedPostgreSQL82Dialect + database: POSTGRESQL + show-sql: false + proxy: + OIL: + username: admin + password: ubiquitous + url: http://helpwildfly.si.cnr.it:8080/rest/ + newProblem: pest + instance: /HDSiper + ldap: + url: ldap://as11.cedrc.cnr.it:389 + managerDn: cn=mastercnrapp8,ou=account,o=CNR,c=it + managerPassword: + mail: + url: "https://nuovascrivaniadigitale.cnr.it" + +ace: + url: https://api.ace.cnr.it/api/ + username: app.scrivaniadigitale + password: + +cnr: + abil: + url: https://attivitainternazionali.cnr.it diff --git a/src/main/resources/config/application-test.yml b/src/main/resources/config/application-test.yml new file mode 100644 index 000000000..88cc905c0 --- /dev/null +++ b/src/main/resources/config/application-test.yml @@ -0,0 +1,88 @@ +spring: + ldap: + url: ldap://virtest1.si.cnr.it:389 + managerDn: cn=mastercnrapp2,ou=account,o=cnr,c=it + managerPassword: pippa + datasource: + type: com.zaxxer.hikari.HikariDataSource + # l'url del db viene modificata all'avvio dell'applicazione a seconda del profilo (cnr => flows-cnr, + # oiv => flows-oiv) in modo che l'applicazione punti un db diverso a seconda del profilo + url: jdbc:postgresql://dockerwebtest01.si.cnr.it:1482/flows + username: activiti + password: activitipw + jpa: + database-platform: it.cnr.si.domain.util.FixedPostgreSQL82Dialect + database: POSTGRESQL + show-sql: false + proxy: + OIL: + username: admin + password: ubiquitous + url: http://helpwildfly.si.cnr.it:8080/rest/ + newProblem: pest + instance: /HDSiper + mail: + activated: false + recipients: + - marcinireneusz.trycz@cnr.it + - massimo.fraticelli@cnr.it + - cironepa@gmail.com + url: http://dockerwebtest01.si.cnr.it:1480 + +cnr: + sigla: + usr: app.scrivaniadigitale + psw: bubbazza + mail: + mail.host: smtp.cnr.it + mail.protocol: smtp + mail.port: 25 + mail.send.error.to: marcinireneusz.trycz@cnr.it + mail.from: no-reply@scrivaniadigitale + abil: + loginUrl: http://dockerwebtest01.si.cnr.it:8088/ + +oiv: + baseurl: http://cool-jconon-funzione-pubblica.test.si.cnr.it + esperienza-noncoerente: ${oiv.baseurl}/rest/application-fp/esperienza-noncoerente + ricalcola-fascia: ${oiv.baseurl}/rest/application-fp/applications-ricalcola-fascia + iscrivi-inelenco: ${oiv.baseurl}/rest/application-fp/iscrivi-inelenco + soccorso-istruttorio: ${oiv.baseurl}/rest/application-fp/soccorso-istruttorio + preavviso-rigetto: ${oiv.baseurl}/rest/application-fp/preavviso-rigetto + comunicazioni: ${oiv.baseurl}/rest/application-fp/comunicazioni + usr: admin + psw: admin + mail: + mail.host: servizi.palazzochigi.it + mail.protocol: smtp + mail.port: 587 + mail.user: elenco.oiv + mail.password: elencooiv2016 + mail.send.error.to: massimo.fraticelli@cnr.it + mail.from: no-reply@scrivaniadigitale + +cache: + hazelcast: + mancenter: http://dockerwebtest01.si.cnr.it:1483/mancenter + port: 1485 + outboundPort: 1486 + +jhipster: + swagger: + title: sprint API + description: sprint API documentation + version: 0.0.1 + termsOfServiceUrl: + contactName: + contactUrl: + contactEmail: + license: + licenseUrl: +jasper-report: + dir-oiv: /src/main/resources/print/oiv-print/ + dir-cnr: /src/main/resources/print/cnr-print/ + +ace: + url: "http://acebuntudock.si.cnr.it:5555/api" + username: app.scrivaniadigitale + password: bubbazza \ No newline at end of file diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml new file mode 100644 index 000000000..3d8c41b51 --- /dev/null +++ b/src/main/resources/config/application.yml @@ -0,0 +1,170 @@ +# =================================================================== +# Spring Boot configuration. +# +# This configuration will be overriden by the Spring profile you use, +# for example application-dev.yml if you use the "dev" profile. +# =================================================================== + +# =================================================================== +# Standard Spring Boot properties. +# Full reference is available at: +# http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html +# =================================================================== + +management: + context-path: /management + health: + mail: + enabled: false # When using the MailService, configure an SMTP server and set this to true + +server: + port: 8080 + +spring: + application: + name: flows + profiles: + # The commented value for `active` can be replaced with valid spring profiles to load. + # Otherwise, it will be filled in by maven when building the WAR file + # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS` + active: prod + jackson: + serialization.write_dates_as_timestamps: false + jpa: + open-in-view: false + hibernate: + ddl-auto: none + naming: + strategy: org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy + properties: + hibernate.cache.use_second_level_cache: true + hibernate.cache.use_query_cache: false + hibernate.generate_statistics: false + hibernate.cache.region.factory_class: it.cnr.si.config.hazelcast.HazelcastCacheRegionFactory + hibernate.cache.use_minimal_puts: true + hibernate.cache.hazelcast.use_lite_member: true + messages: + basename: i18n/messages + mvc: + favicon: + enabled: false + thymeleaf: + mode: XHTML + enabled: false + http: + multipart: + # File upload limit + maxFileSize: 50Mb + maxRequestSize: 50Mb + autoconfigure: + exclude: org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration + ldap: + userSearchBase: o=cnr, c=it + userSearchFilter: uid={0} + +security: + basic: + enabled: false + +# =================================================================== +# JHipster specific properties +# =================================================================== + +jhipster: + async: + corePoolSize: 2 + maxPoolSize: 50 + queueCapacity: 10000 + #cors: #By default CORS are not enabled. Uncomment to enable. + #allowed-origins: "*" + #allowed-methods: GET, PUT, POST, DELETE, OPTIONS + #allowed-headers: "*" + #exposed-headers: + #allow-credentials: true + #max-age: 1800 + mail: + from: no-reply@nuovascrivaniadigitale.cnr.it + swagger: + title: sprint API + description: sprint API documentation + version: 0.0.1 + termsOfServiceUrl: + contactName: + contactUrl: + contactEmail: + license: + licenseUrl: + ribbon: + # comma seperated list of profiles to show a ribbon on the GUI + displayOnActiveProfiles: dev,test + +ajp: + port: 8099 + timeout: 120000 + +cache.hazelcast.port: 5701 +cache.hazelcast.packages: it.cnr.si + +cnr: + activiti: + diagram-font: DejaVu Sans + sigla: + usr: app.scrivaniadigitale + psw: bubbazza + coolflows: + username: utente1 + password: HggHjhUIuhedfwUI788yasdfiuh897 + firma: + signcertid: AS0 + typeotpauth: firma + url: http://arss.cedrc.cnr.it:8080/ArubaSignService/ArubaSignService?wsdl + pdfprofile: PADESBES + mail: + mail.host: smtp.cnr.it + mail.protocol: smtp + mail.port: 25 + mail.send.error.to: marcinireneusz.trycz@cnr.it + mail.from: no-reply@scrivaniadigitale + siper: + url: https://siper.cnr.it/ + username: app.scrivaniadigitale + password: bubbazza + abil: + username: app.scrivaniadigitale + password: bubbazza + url: http://dockerwebtest01.si.cnr.it:8088 + loginPath: /api/authenticate + domandePath: /api/cambioStatoDomanda + +jasper-report: + dir-oiv: /src/main/resources/print/oiv-print/ + dir-cnr: /src/main/resources/print/cnr-print/ + +repository: + base: + url: http://as1dock.si.cnr.it:8080/alfresco/ +org: + apache: + chemistry: + opencmis: + binding: + atompub: + url: ${repository.base.url}api/-default-/public/cmis/versions/1.1/atom + browser: + url: ${repository.base.url}api/-default-/public/cmis/versions/1.1/browser + spi: + type: atompub + connecttimeout: 50000 + readtimeout: 3000000 + httpinvoker: + classname: org.apache.chemistry.opencmis.client.bindings.spi.http.DefaultHttpInvoker + +user: + admin: + username: admin + password: admin + +# File upload limit +multipart: + maxFileSize: 50Mb + maxRequestSize: 50Mb From 17722741cb3069d361ccc84ac87cd3b807cbb609 Mon Sep 17 00:00:00 2001 From: Marcin Ireneusz Trycz Date: Mon, 16 Dec 2019 09:27:52 +0100 Subject: [PATCH 02/13] 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 23b1162e8ef8e351662bb7bdba7b9d8ba4fce03e Mon Sep 17 00:00:00 2001 From: Marcin Ireneusz Trycz Date: Mon, 16 Dec 2019 09:28:59 +0100 Subject: [PATCH 03/13] 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 9f1fec5e55adbdeb2e99b2277405714c19ce2b88 Mon Sep 17 00:00:00 2001 From: Marcin Ireneusz Trycz Date: Mon, 16 Dec 2019 09:32:55 +0100 Subject: [PATCH 04/13] 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 @@ v6.17.1 - 3.10.5 + 3.10.10 From fa30cbdc96e8a397b1d34eebbf3d3bc87341cd97 Mon Sep 17 00:00:00 2001 From: Marcin Ireneusz Trycz Date: Mon, 16 Dec 2019 09:40:51 +0100 Subject: [PATCH 05/13] 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 5cf98e3bc9105a025468d86cae59d4b9d0718324 Mon Sep 17 00:00:00 2001 From: TRYCZ MARCINIRENEUSZ Date: Thu, 9 Jan 2020 09:58:43 +0000 Subject: [PATCH 06/13] 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 8b7ae5791c5159b85a90750f0970976300208d7f Mon Sep 17 00:00:00 2001 From: Marcin Ireneusz Trycz Date: Thu, 9 Jan 2020 11:14:18 +0100 Subject: [PATCH 07/13] Derompo Abil --- .gitlab-ci.yml | 6 +++--- src/main/resources/config/application.yml | 2 +- 2 files changed, 4 insertions(+), 4 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 diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 3d8c41b51..8639dfeaa 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -131,7 +131,7 @@ cnr: password: bubbazza abil: username: app.scrivaniadigitale - password: bubbazza + password: portacigliarancini2019 url: http://dockerwebtest01.si.cnr.it:8088 loginPath: /api/authenticate domandePath: /api/cambioStatoDomanda From 2ebc3157cec1c1856921a4536dc5e8b43ddb8823 Mon Sep 17 00:00:00 2001 From: TRYCZ MARCINIRENEUSZ Date: Thu, 9 Jan 2020 13:06:25 +0000 Subject: [PATCH 08/13] 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 ffab5eaf807b2b04212e3dedda645265044818eb Mon Sep 17 00:00:00 2001 From: TRYCZ MARCINIRENEUSZ Date: Thu, 9 Jan 2020 13:07:13 +0000 Subject: [PATCH 09/13] 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 88ae916ef7e24b35ad5f1399ca7dfc22e0cfaca5 Mon Sep 17 00:00:00 2001 From: TRYCZ MARCINIRENEUSZ Date: Thu, 9 Jan 2020 13:23:27 +0000 Subject: [PATCH 10/13] 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 63548ec13b2e1a8b3c48ce8163b4ee890b5086b8 Mon Sep 17 00:00:00 2001 From: TRYCZ MARCINIRENEUSZ Date: Thu, 9 Jan 2020 13:47:36 +0000 Subject: [PATCH 11/13] Update .gitlab-ci.yml From 4cac7652f08d11dfa63f57ed3348c5c0db409970 Mon Sep 17 00:00:00 2001 From: TRYCZ MARCINIRENEUSZ Date: Thu, 9 Jan 2020 13:59:39 +0000 Subject: [PATCH 12/13] 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 fd557d30b9e8a8302de4e432209a8c9db1501077 Mon Sep 17 00:00:00 2001 From: TRYCZ MARCINIRENEUSZ Date: Thu, 9 Jan 2020 14:30:20 +0000 Subject: [PATCH 13/13] 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"