changes to deploy

.gitignore

@@ -234,9 +234,9 @@ deployment/playbooks/templates/vitamui/conf/*/*.p12
 ###################################
 api/api-archive-search/archive-search-internal/src/main/resources/dev/vitam/*
 api/api-ingest/ingest-internal/src/main/resources/dev/vitam/*
-api/api-referential/referential-internal/src/main/resources/dev/vitam/*
+#api/api-referential/referential-internal/src/main/resources/dev/vitam/*
 api/api-ingest/ingest-internal/src/main/resources/dev/vitam/*
-api/api-iam/iam-internal/src/main/resources/dev/vitam/*
+#api/api-iam/iam-internal/src/main/resources/dev/vitam/*
 
 ##########################################
 # Mongo workspace entry-point #

.gitlab-ci.yml

+variables:
+  GIT_SSL_NO_VERIFY: "true"
+  DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
+  MAVEN_OPTS: "-Dmaven.repo.local=$HOME/.m2/repository"
+
+stages:
+  - build_vitamui
+  - scan_quality_code
+  - generate_certs_keystores
+  - deploy_services_vitamui
+  - deploy_mongo
+  - merge_test
+  - merge_to_master
+  - test
+
+.machine: &runner-shell-vitamui
+  tags:
+    - vitamui, sh
+
+build_project_vitamui:dev:
+  stage: build_vitamui
+  when: manual
+  only:
+    - deploy/pr-vitam-ui
+  <<: *runner-shell-vitamui
+  script:
+    - docker build --cache-from none -f Dockerfile .
+  dependencies: []
+
+scan_code:dev:
+  stage: scan_quality_code
+  when: manual
+  only:
+    - deploy/pr-vitam-ui
+  <<: *runner-shell-vitamui
+  script:
+    - mvn clean verify -Psonar -DskipTests -Dsonar.projectKey=cines-vitamui -Dsonar.host.url=$SONAR_HOST -Dsonar.login=$TOKEN_SONAR
+  dependencies: []
+
+generates_certificates:dev:
+  stage: generate_certs_keystores
+  when: manual
+  only:
+    - deploy/pr-vitam-ui
+  <<: *runner-shell-vitamui
+  script:
+    - ./deployment/pki/scripts/generate_ca_dev.sh
+    - ./deployment/pki/scripts/generate_certs_dev.sh $PWD/deployment/environments/hosts.local
+    - rm -rf dev-deployment/environments/certs/server/hosts/localhost/
+    - mv dev-deployment/environments/certs/server/hosts/sandbox23-adm.cines.fr/ dev-deployment/environments/certs/server/hosts/localhost
+    - rm -rf dev-deployment/environments/keystores/server/localhost/
+    - ./deployment/generate_stores_dev.sh $PWD/deployment/environments/hosts.local
+  artifacts:
+    paths:
+      - dev-deployment/
+  dependencies: []
+
+deploy_services_vitamui:dev:
+  stage: deploy_services_vitamui
+  when: manual
+  only:
+    - deploy/pr-vitam-ui
+  <<: *runner-shell-vitamui
+  script:
+    - sh tools/docker/cines/stop-container.sh
+    - sh tools/docker/cines/tag-images.sh $PREFIX_IMAGE
+    #- sh tools/docker/cines/push-images.sh $PREFIX_IMAGE
+    #- docker system prune --all
+    - mv tools/docker/cines/start-container.yml .
+    - docker-compose -f start-container.yml --env-file tools/docker/cines/.env up  -d
+
+deploy_database:dev:
+  stage: deploy_mongo
+  when: manual
+  only:
+    - deploy/pr-vitam-ui
+  <<: *runner-shell-vitamui
+  script:
+    - who
+    - cd tools/docker/mongo
+    - ./restart_dev.sh
+
+deploy_test:dev:
+  stage: merge_test
+  when: manual
+  only:
+    - deploy/pr-vitam-ui
+  <<: *runner-shell-vitamui
+  script:
+    - git clone https://oauth2:$TOKEN_GITLAB@$LIEN_CINES_VITAMUI
+    - cd cines-vitamui
+    - git fetch
+    - git checkout feat/test && git log
+    - git checkout deploy/pr-vitam-ui && git log
+    - git checkout -b feat/merge-test
+    - export commit=$(git log --grep Dockerization --pretty=format:"%h")
+    - git checkout deploy/pr-vitam-ui
+    - git reset --hard HEAD~1
+    - git merge feat/test
+    - git cherry-pick $commit
+    - git push --force
+merge_master:dev:
+  stage: merge_to_master
+  when: manual
+  only:
+    - deploy/pr-vitam-ui
+  <<: *runner-shell-vitamui
+  script:
+    - git clone https://oauth2:$TOKEN_GITLAB@$LIEN_CINES_VITAMUI
+    - cd cines-vitamui
+    - git fetch
+    - git checkout deploy/pr-vitam-ui && git checkout master
+    - git checkout -b merge-master
+    - git merge deploy/pr-vitam-ui
+    - git log
+    - git reset --hard HEAD~1
+    - git checkout master
+    - git merge merge-master
+    - git push

Dockerfile

+FROM maven:3.6.3-jdk-11 as dependencies
+MAINTAINER Zakaria NAJI
+LABEL name=dependencies
+USER root
+COPY . /app
+WORKDIR /app
+RUN mvn clean install -DskipTests
+
+FROM adoptopenjdk/openjdk11 AS security-internal
+MAINTAINER Zakaria NAJI
+LABEL name=security-internal
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-security/security-commons /app/api/api-security/security-commons
+COPY --from=dependencies /app/commons/commons-mongo /app/commons/commons-mongo
+COPY --from=dependencies /app/api/api-security/security-internal/target /app/api/api-security/security-internal/target
+COPY --from=dependencies /app/api/api-security/security-internal/run.sh /app/api/api-security/security-internal/run.sh
+COPY --from=dependencies /app/api/api-security/security-internal/pom.xml /app/api/api-security/security-internal/pom.xml
+WORKDIR /app/api/api-security/security-internal
+RUN chmod +x run.sh
+EXPOSE 8084
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS iam-internal
+MAINTAINER Zakaria NAJI
+LABEL name=iam-internal
+COPY --from=dependencies /app/commons/commons-vitam /app/commons/commons-vitam
+COPY --from=dependencies /app/commons/commons-logbook /app/commons/commons-logbook
+COPY --from=dependencies /app/commons/commons-mongo /app/commons/commons-mongo
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons/target /app/api/api-iam/iam-commons/target
+COPY --from=dependencies /app/api/api-iam/iam-commons/pom.xml /app/api/api-iam/iam-commons/pom.xml
+COPY --from=dependencies /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=dependencies /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=dependencies /app/api/api-iam/iam-internal/target /app/api/api-iam/iam-internal/target
+COPY --from=dependencies /app/api/api-iam/iam-internal/run.sh /app/api/api-iam/iam-internal/run.sh
+COPY --from=dependencies /app/api/api-iam/iam-internal/pom.xml /app/api/api-iam/iam-internal/pom.xml
+WORKDIR /app/api/api-iam/iam-internal
+RUN chmod +x run.sh
+EXPOSE 7083
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS iam-external
+MAINTAINER Zakaria NAJI
+LABEL name=iam-external
+COPY --from=dependencies /app/commons/commons-vitam /app/commons/commons-vitam
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons/target /app/api/api-iam/iam-commons/target
+COPY --from=dependencies /app/api/api-iam/iam-commons/pom.xml /app/api/api-iam/iam-commons/pom.xml
+COPY --from=dependencies /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=dependencies /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=dependencies /app/api/api-iam/iam-internal-client/target /app/api/api-iam/iam-internal-client/target
+COPY --from=dependencies /app/api/api-iam/iam-internal-client/pom.xml /app/api/api-iam/iam-internal-client/pom.xml
+COPY --from=dependencies /app/api/api-iam/iam-external/target /app/api/api-iam/iam-external/target
+COPY --from=dependencies /app/api/api-iam/iam-external/run.sh /app/api/api-iam/iam-external/run.sh
+COPY --from=dependencies /app/api/api-iam/iam-external/pom.xml /app/api/api-iam/iam-external/pom.xml
+WORKDIR /app/api/api-iam/iam-external
+RUN chmod +x run.sh
+EXPOSE 8083
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS referential-external
+MAINTAINER Zakaria NAJI
+LABEL name=referential-external
+COPY --from=dependencies /app/api/api-referential/referential-commons/target /app/api/api-referential/referential-commons/target
+COPY --from=dependencies /app/api/api-referential/referential-commons/pom.xml /app/api/api-referential/referential-commons/pom.xml
+COPY --from=dependencies /app/commons/commons-vitam /app/commons/commons-vitam
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=dependencies /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=dependencies /app/api/api-iam/iam-internal-client/target /app/api/api-iam/iam-internal-client/target
+COPY --from=dependencies /app/api/api-iam/iam-internal-client/pom.xml /app/api/api-iam/iam-internal-client/pom.xml
+COPY --from=dependencies /app/api/api-referential/referential-internal-client/target /app/api/api-referential/referential-internal-client/target
+COPY --from=dependencies /app/api/api-referential/referential-internal-client/pom.xml /app/api/api-referential/referential-internal-client/pom.xml
+COPY --from=dependencies /app/api/api-referential/referential-external/target /app/api/api-referential/referential-external/target
+COPY --from=dependencies /app/api/api-referential/referential-external/run.sh /app/api/api-referential/referential-external/run.sh
+COPY --from=dependencies /app/api/api-referential/referential-external/pom.xml /app/api/api-referential/referential-external/pom.xml
+WORKDIR /app/api/api-referential/referential-external
+RUN chmod +x run.sh
+EXPOSE 8087
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS referential-internal
+MAINTAINER Zakaria NAJI
+LABEL name=referential-internal
+COPY --from=dependencies /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=dependencies /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=dependencies /app/commons/commons-vitam /app/commons/commons-vitam
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-referential/referential-commons/target /app/api/api-referential/referential-commons/target
+COPY --from=dependencies /app/api/api-referential/referential-commons/pom.xml /app/api/api-referential/referential-commons/pom.xml
+COPY --from=dependencies /app/api/api-referential/referential-internal/target /app/api/api-referential/referential-internal/target
+COPY --from=dependencies /app/api/api-referential/referential-internal/run.sh /app/api/api-referential/referential-internal/run.sh
+COPY --from=dependencies /app/api/api-referential/referential-internal/pom.xml /app/api/api-referential/referential-internal/pom.xml
+WORKDIR /app/api/api-referential/referential-internal
+RUN chmod +x run.sh
+EXPOSE 7087
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS pastis-external
+MAINTAINER Zakaria NAJI
+LABEL name=pastis-external
+COPY --from=dependencies /app/api/api-iam/iam-security /app/api/api-iam/iam-security
+COPY --from=dependencies /app/api/api-security/security-client /app/api/api-security/security-client
+COPY --from=dependencies /app/api/api-iam/iam-internal-client/target /app/api/api-iam/iam-internal-client/target
+COPY --from=dependencies /app/api/api-iam/iam-internal-client/pom.xml /app/api/api-iam/iam-internal-client/pom.xml
+COPY --from=dependencies /app/commons/commons-vitam /app/commons/commons-vitam
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-pastis/pastis-commons/target /app/api/api-pastis/pastis-commons/target
+COPY --from=dependencies /app/api/api-pastis/pastis-commons/pom.xml /app/api/api-pastis/pastis-commons/pom.xml
+COPY --from=dependencies /app/api/api-pastis/pastis-client/target /app/api/api-pastis/pastis-client/target
+COPY --from=dependencies /app/api/api-pastis/pastis-client/pom.xml /app/api/api-pastis/pastis-client/pom.xml
+COPY --from=dependencies /app/api/api-pastis/pastis/target /app/api/api-pastis/pastis/target
+COPY --from=dependencies /app/api/api-pastis/pastis/run.sh /app/api/api-pastis/pastis/run.sh
+COPY --from=dependencies /app/api/api-pastis/pastis/pom.xml /app/api/api-pastis/pastis/pom.xml
+WORKDIR /app/api/api-pastis/pastis
+RUN chmod +x run.sh
+EXPOSE 8015
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS cas-server
+MAINTAINER Zakaria NAJI
+LABEL name=cas-server
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons/target /app/api/api-iam/iam-commons/target
+COPY --from=dependencies /app/api/api-iam/iam-commons/pom.xml /app/api/api-iam/iam-commons/pom.xml
+COPY --from=dependencies /app/api/api-iam/iam-external-client/target /app/api/api-iam/iam-external-client/target
+COPY --from=dependencies /app/api/api-iam/iam-external-client/pom.xml /app/api/api-iam/iam-external-client/pom.xml
+COPY --from=dependencies /app/cas/cas-server/target /app/cas/cas-server/target
+COPY --from=dependencies /app/cas/cas-server/run_recette.sh /app/cas/cas-server/run_recette.sh
+COPY --from=dependencies /app/cas/cas-server/src/main/config /app/cas/cas-server/src/main/config
+COPY --from=dependencies /app/cas/cas-server/pom.xml /app/cas/cas-server/pom.xml
+COPY --from=dependencies /app/cas/pom.xml /app/cas/pom.xml
+COPY --from=dependencies /app/dev-deployment/environments/keystores/server /app/dev-deployment/environments/keystores/server
+WORKDIR /app/cas/cas-server
+RUN chmod +x run_recette.sh
+EXPOSE 8080
+ENTRYPOINT ["/bin/bash", "./run_recette.sh"]
+
+FROM adoptopenjdk/openjdk11 AS ui-portal
+MAINTAINER Zakaria NAJI
+LABEL name=ui-portal
+COPY --from=dependencies /app/api/api-iam/iam-external-client/target /app/api/api-iam/iam-external-client/target
+COPY --from=dependencies /app/api/api-iam/iam-external-client/pom.xml /app/api/api-iam/iam-external-client/pom.xml
+COPY --from=dependencies /app/ui/ui-frontend/target /app/ui/ui-frontend/target
+COPY --from=dependencies /app/ui/ui-frontend/dist /app/ui/ui-frontend/dist
+COPY --from=dependencies /app/ui/ui-frontend/pom.xml /app/ui/ui-frontend/pom.xml
+COPY --from=dependencies /app/ui/ui-commons/target /app/ui/ui-commons/target
+COPY --from=dependencies /app/ui/ui-commons/pom.xml /app/ui/ui-commons/pom.xml
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/api/api-iam/iam-commons/target /app/api/api-iam/iam-commons/target
+COPY --from=dependencies /app/api/api-iam/iam-commons/pom.xml /app/api/api-iam/iam-commons/pom.xml
+COPY --from=dependencies /app/ui/ui-portal/target /app/ui/ui-portal/target
+COPY --from=dependencies /app/ui/ui-portal/run.sh /app/ui/ui-portal/run.sh
+COPY --from=dependencies /app/ui/ui-portal/pom.xml /app/ui/ui-portal/pom.xml
+WORKDIR /app/ui/ui-portal
+RUN chmod +x run.sh
+EXPOSE 9000
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS ui-identity
+MAINTAINER Zakaria NAJI
+LABEL name=ui-identity
+COPY --from=dependencies /app/api/api-iam/iam-external-client/target /app/api/api-iam/iam-external-client/target
+COPY --from=dependencies /app/api/api-iam/iam-external-client/pom.xml /app/api/api-iam/iam-external-client/pom.xml
+COPY --from=dependencies /app/ui/ui-frontend/target /app/ui/ui-frontend/target
+COPY --from=dependencies /app/ui/ui-frontend/dist /app/ui/ui-frontend/dist
+COPY --from=dependencies /app/ui/ui-frontend/pom.xml /app/ui/ui-frontend/pom.xml
+COPY --from=dependencies /app/ui/ui-commons/target /app/ui/ui-commons/target
+COPY --from=dependencies /app/ui/ui-commons/pom.xml /app/ui/ui-commons/pom.xml
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/commons/commons-security /app/commons/commons-security
+COPY --from=dependencies /app/api/api-iam/iam-commons/target /app/api/api-iam/iam-commons/target
+COPY --from=dependencies /app/api/api-iam/iam-commons/pom.xml /app/api/api-iam/iam-commons/pom.xml
+COPY --from=dependencies /app/ui/ui-identity/target /app/ui/ui-identity/target
+COPY --from=dependencies /app/ui/ui-identity/run.sh /app/ui/ui-identity/run.sh
+COPY --from=dependencies /app/ui/ui-identity/pom.xml /app/ui/ui-identity/pom.xml
+WORKDIR /app/ui/ui-identity
+RUN chmod +x run.sh
+EXPOSE 9001
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS ui-referential
+MAINTAINER Zakaria NAJI
+LABEL name=ui-referential
+COPY --from=dependencies /app/api/api-referential/referential-commons/target /app/api/api-referential/referential-commons/target
+COPY --from=dependencies /app/api/api-referential/referential-commons/pom.xml /app/api/api-referential/referential-commons/pom.xml
+COPY --from=dependencies /app/api/api-referential/referential-external-client/target /app/api/api-referential/referential-external-client/target
+COPY --from=dependencies /app/api/api-referential/referential-external-client/pom.xml /app/api/api-referential/referential-external-client/pom.xml
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/ui/ui-commons/target /app/ui/ui-commons/target
+COPY --from=dependencies /app/ui/ui-commons/pom.xml /app/ui/ui-commons/pom.xml
+COPY --from=dependencies /app/ui/ui-frontend/target /app/ui/ui-frontend/target
+COPY --from=dependencies /app/ui/ui-frontend/dist /app/ui/ui-frontend/dist
+COPY --from=dependencies /app/ui/ui-frontend/pom.xml /app/ui/ui-frontend/pom.xml
+COPY --from=dependencies /app/ui/ui-referential/target /app/ui/ui-referential/target
+COPY --from=dependencies /app/ui/ui-referential/run.sh /app/ui/ui-referential/run.sh
+COPY --from=dependencies /app/ui/ui-referential/pom.xml /app/ui/ui-referential/pom.xml
+WORKDIR /app/ui/ui-referential
+RUN chmod +x run.sh
+EXPOSE 9002
+ENTRYPOINT ["/bin/bash", "./run.sh"]
+
+FROM adoptopenjdk/openjdk11 AS ui-pastis
+MAINTAINER Zakaria NAJI
+LABEL name=ui-pastis
+COPY --from=dependencies /app/api/api-iam/iam-external-client/target /app/api/api-iam/iam-external-client/target
+COPY --from=dependencies /app/api/api-iam/iam-external-client/pom.xml /app/api/api-iam/iam-external-client/pom.xml
+COPY --from=dependencies /app/api/api-iam/iam-commons/target /app/api/api-iam/iam-commons/target
+COPY --from=dependencies /app/api/api-iam/iam-commons/pom.xml /app/api/api-iam/iam-commons/pom.xml
+COPY --from=dependencies /app/commons/commons-rest /app/commons/commons-rest
+COPY --from=dependencies /app/commons/commons-api /app/commons/commons-api
+COPY --from=dependencies /app/ui/ui-commons/target /app/ui/ui-commons/target
+COPY --from=dependencies /app/ui/ui-commons/pom.xml /app/ui/ui-commons/pom.xml
+COPY --from=dependencies /app/api/api-pastis/pastis-client/target /app/api/api-pastis/pastis-client/target
+COPY --from=dependencies /app/api/api-pastis/pastis-client/pom.xml /app/api/api-pastis/pastis-client/pom.xml
+COPY --from=dependencies /app/api/api-pastis/pastis-commons/target /app/api/api-pastis/pastis-commons/target
+COPY --from=dependencies /app/api/api-pastis/pastis-commons/pom.xml /app/api/api-pastis/pastis-commons/pom.xml
+COPY --from=dependencies /app/ui/ui-frontend/target /app/ui/ui-frontend/target
+COPY --from=dependencies /app/ui/ui-frontend/dist /app/ui/ui-frontend/dist
+COPY --from=dependencies /app/ui/ui-frontend/pom.xml /app/ui/ui-frontend/pom.xml
+COPY --from=dependencies /app/ui/ui-pastis/target /app/ui/ui-pastis/target
+COPY --from=dependencies /app/ui/ui-pastis/run.sh /app/ui/ui-pastis/run.sh
+COPY --from=dependencies /app/ui/ui-pastis/pom.xml /app/ui/ui-pastis/pom.xml
+WORKDIR /app/ui/ui-pastis
+RUN chmod +x run.sh
+EXPOSE 9015
+ENTRYPOINT ["/bin/bash", "./run.sh"]

api/api-iam/iam-external/run.sh

@@ -7,4 +7,4 @@ cp -r src/main/config target/src/main/config
 #retrieve version
 version="$(grep -oP '(?<=>).*?(?=</version>)' pom.xml | grep -v 'version')"
 
-./target/iam-external-$(echo $version).jar -Xms128m -Xmx512m --spring.profiles.active=dev
+java -jar target/iam-external-$(echo $version).jar -Xms128m -Xmx512m --spring.profiles.active=dev

api/api-iam/iam-internal/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ spring:
         register: false
   data:
     mongodb:
-      uri: mongodb://mongod_dbuser_iam:mongod_dbpwd_iam@localhost:27018/iam?connectTimeoutMS=2000
+      uri: mongodb://mongod_dbuser_iam:mongod_dbpwd_iam@10.6.10.23:27018/iam?connectTimeoutMS=2000
 
 server-identity:
   identityName: vitamui-dev
@@ -38,7 +38,7 @@ security:
   port: 8084
 
 cas-client:
-  server-host: dev.vitamui.com
+  server-host: sandbox23-adm.cines.fr
   server-port: 8080
   secure: true
   ssl-configuration:
@@ -54,7 +54,7 @@ cas-client:
 cas.reset.password.url: /cas/extras/resetPassword?username={username}&firstname={firstname}&lastname={lastname}&language={language}&ttl=1day
 
 login:
-  url: http://dev.vitamui.com:8080/cas/login
+  url: http://sandbox23-adm.cines.fr:8080/cas/login
 
 login.attempts.maximum.failures: 5
 login.attempts.time.interval: 20

api/api-ingest/pom.xml

@@ -14,7 +14,6 @@
     <description>VITAMUI Ingest API</description>
 
     <modules>
-        <module>ingest-internal</module>
         <module>ingest-external</module>
         <module>ingest-internal-client</module>
         <module>ingest-external-client</module>

api/api-pastis/pastis-standalone/assembly.xml

+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>package</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.exe</include>
+                <include>win32/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources/standalone/</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>PASTIS-APP.*</include>
+                <include>readme.txt</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
+

api/api-pastis/pastis-standalone/run.sh

+#!/bin/bash
+
+#retrieve version
+version="$(grep -oP '(?<=>).*?(?=</version>)' pom.xml | grep -v 'version' | grep 'SNAPSHOT' | sort --unique)"
+
+java -jar target/pastis-standalone-$(echo $version).jar

api/api-pastis/pastis-standalone/src/main/resources/standalone/angular.json

@@ -114,7 +114,7 @@
           "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
             "browserTarget": "pastis:build",
-            "host": "dev.vitamui.com",
+            "host": "sandbox23-adm.cines.fr",
             "port": 4251
           },
           "configurations": {

api/api-pastis/pastis/run.sh

 #!/bin/bash
 
 #retrieve version
-version="$(grep -oP '(?<=>).*?(?=</version>)' pom.xml | grep -v 'version' | grep -oP 'SNAPSHOT')"
+version="$(grep -oP '(?<=>).*?(?=</version>)' pom.xml | grep -v 'version' | grep 'SNAPSHOT' | sort --unique)"
 
-java -jar target/pastis-5.0-SNAPSHOT.jar -Xms128m -Xmx512m --spring.profiles.active=dev
+java -jar target/pastis-$(echo $version).jar -Xms128m -Xmx512m --spring.profiles.active=dev

api/api-pastis/pastis/src/main/resources/application-dev.yml

@@ -42,8 +42,8 @@ server:
   port: 8015
   ssl:
     key-store: src/main/resources/dev/keystore_pastis-external.jks
-    key-store-password: e2zS1Za6se9vYky0uoATKDfuXDp0j6r4PBWDn4ZHQvX5cKfX
-    key-password: e2zS1Za6se9vYky0uoATKDfuXDp0j6r4PBWDn4ZHQvX5cKfX
+    key-store-password: YTN1YK1GRwW4FYdLkoTwPrFtO1A3NsYbvDnTSj1NPm9OOP3n
+    key-password: YTN1YK1GRwW4FYdLkoTwPrFtO1A3NsYbvDnTSj1NPm9OOP3n
     trust-store: src/main/resources/dev/truststore_server.jks
     trust-store-password: changeme
     client-auth: need
@@ -81,4 +81,4 @@ logging:
     fr.gouv.vitamui: DEBUG
     fr.gouv.vitamui.iam.security: DEBUG
     #level.org.springframework.web.filter.CommonsRequestLoggingFilter: DEBUG
-cors.allowed-origins: https://dev.vitamui.com:4251,https://localhost
+cors.allowed-origins: https://sandbox23-adm.cines.fr:4251,https://localhost