Commit 18a7cd98 authored by Noel Alonso's avatar Noel Alonso
Browse files

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

parents 41e5d910 ca993f69

.gitlab-ci.yml

+16 −7
Original line number Diff line number Diff line
@@ -187,16 +187,17 @@ deploy-commands-dev: 
    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-commands

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

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

  only:

    - dev
@@ -215,6 +216,7 @@ deploy-view-dev: 
    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -222,9 +224,10 @@ deploy-view-dev: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

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

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

  only:

    - dev
@@ -242,16 +245,17 @@ deploy-commands-supporting-branch: 
    SPRING_PROFILES_ACTIVE: pre

    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-commands

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

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands

  only:

    - branches

  except:
@@ -274,6 +278,7 @@ deploy-view-supporting-branch: 
    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -281,9 +286,10 @@ deploy-view-supporting-branch: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${DEV_ELASTIC_CLUSTERNAME}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

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

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

  only:

    - branches

  except:
@@ -305,13 +311,14 @@ deploy-commands-pro: 
    SPRING_PROFILES_ACTIVE: prod

    OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro/${CI_PROJECT_NAME}-commands

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/commands
@@ -334,6 +341,7 @@ deploy-view-pro: 
    OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${PRO_ELASTIC_CLUSTERNAME}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:
@@ -341,6 +349,7 @@ deploy-view-pro: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro/${CI_PROJECT_NAME}-view

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

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

+7 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  vessels-commands:

    deploy:

      placement:

        constraints:

          - node.role == worker



volumes:

  commands-vol:

    name: "${UNIT_NAME}-commands-{{.Task.Slot}}-vol"

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

+19 −16
Original line number Diff line number Diff line
@@ -11,14 +11,26 @@ services: 
      - MICROSERVICE_NAME=${UNIT_NAME}-commands

      - SPRING_KAFKA_CLIENT-ID={{.Service.Name}}-{{.Task.Slot}}

      - JAVA_OPTS=-Xmx1848m -Xms256m

    networks:

      - metric-net

      - kafka-net

      - redmic-net

      - traefik-net

    volumes:

      - commands-vol:/tmp/kafka

    healthcheck:

      test: wget --spider -q http://localhost:${COMMANDS_PORT}/api/${UNIT_NAME}/commands/actuator/health

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${COMMANDS_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/api/${UNIT_NAME}/commands

        traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${UNIT_NAME}/commands

        traefik.backend: ${UNIT_NAME}-commands

        traefik.port: "${COMMANDS_PORT}"

      restart_policy:

        delay: 1m

        window: 3m
@@ -28,29 +40,20 @@ services: 
          memory: 2G

        reservations:

          memory: 1639M

    networks:

      - metric-net

      - kafka-net

      - redmic-net

      - traefik-net

    volumes:

      - commands-vol:/tmp/kafka

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${COMMANDS_PORT}/api/${UNIT_NAME}/commands/actuator/health

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m



networks:

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true



  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    external: true



  redmic-net:

    name: ${REDMIC_NET_NAME:-redmic-net}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true

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

+20 −16
Original line number Diff line number Diff line
@@ -12,14 +12,25 @@ services: 
      - MICROSERVICE_NAME=${UNIT_NAME}-view

      - SPRING_KAFKA_CLIENT-ID={{.Service.Name}}-{{.Task.Slot}}

      - JAVA_OPTS=-Xmx568m -Xms256m

    networks:

      - elastic-net

      - metric-net

      - kafka-net

      - redmic-net

      - traefik-net

    healthcheck:

      test: wget --spider -q http://localhost:${VIEW_PORT}/api/${UNIT_NAME}/view/actuator/health

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "${VIEW_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/api/${UNIT_NAME}/view

        traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${UNIT_NAME}/view

        traefik.backend: ${UNIT_NAME}-view

        traefik.port: "${VIEW_PORT}"

      restart_policy:

        delay: 1m

        window: 3m
@@ -29,31 +40,24 @@ services: 
          memory: 768M

        reservations:

          memory: 615M

    networks:

      - elastic6-net

      - metric-net

      - kafka-net

      - redmic-net

      - traefik-net

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${VIEW_PORT}/api/${UNIT_NAME}/view/actuator/health

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m



networks:

  elastic6-net:

  elastic-net:

    name: ${ELASTIC_NET_NAME:-elastic6-net}

    external: true



  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true



  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    external: true



  redmic-net:

    name: ${REDMIC_NET_NAME:-redmic-net}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true