Commit d2a8f658 authored by Noel Alonso's avatar Noel Alonso
Browse files

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

parents f576ae23 db01b003

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ deploy-dev: 
    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=pre AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}

      APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ services: 
      - MICROSERVICE_PORT

      - SPRING_PROFILES_ACTIVE

      - AISHUB_SERVICE_USERNAME

      - APP_SCHEDULING_ENABLE

      - JAVA_OPTS=-Xmx512m -Xss512m

    networks:

      - kafka-net