Commit 50f9b67f authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/server/vessels into dev

parents 943b7b3c 32d69409

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ maven-build-commands: 
  variables:

    MAVEN_OPTS: -Dmaven.repo.local=.m2/repository

    SPRING_PROFILES_ACTIVE: test

    LOGGING_LEVEL_ROOT: error

    LOGGING_LEVEL_ROOT: "off"

    LOGGING_LEVEL_ORG_SPRINGFRAMEWORK: error

    LOGGING_LEVEL_ES_REDMIC: error

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

deploy/docker-compose.vessels-commands.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ services: 
      - OAUTH_CLIENT_ID

      - OAUTH_CLIENT_SECRET

      - MICROSERVICE_NAME=${UNIT_NAME}-commands

      - JAVA_OPTS=-XX:MaxRAMFraction=1

      - JAVA_OPTS=-XX:MaxRAMFraction=2

    networks:

      - kafka-net

      - redmic-net

deploy/docker-compose.vessels-view.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ services: 
      - OAUTH_CLIENT_SECRET

      - ELASTIC_XPACKSECURITYUSER

      - MICROSERVICE_NAME=${UNIT_NAME}-view

      - JAVA_OPTS=-XX:MaxRAMFraction=1

      - JAVA_OPTS=-XX:MaxRAMFraction=2

    networks:

      - elastic-net

      - kafka-net