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

Actualiza docker-compose a nueva estructura 

Añadiendo variables para flexibilizar la configuración
Modificando estructura...
parent afa56c50

deploy/docker-compose.time-series-commands.dev.yml

+9 −7
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ version: '3.5' 
services:

  time-series-commands:

    environment:

      - JAVA_OPTS=-Xmx768m -Xms256m

      SPRING_PROFILES_ACTIVE: pre

      JAVA_OPTS: -Xmx768m -Xms256m

    deploy:

      resources:

        limits:

              cpus: '1'

              memory: 1G

          cpus: '${TIME_SERIES_COMMANDS_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${TIME_SERIES_COMMANDS_RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

              memory: 820M
 
          cpus: '${TIME_SERIES_COMMANDS_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${TIME_SERIES_COMMANDS_RESOURCES_RESERVATIONS_MEMORY:-820M}

deploy/docker-compose.time-series-commands.prod.yml

+6 −7
Original line number Diff line number Diff line
@@ -3,14 +3,13 @@ version: '3.5' 
services:

  time-series-commands:

    environment:

      - JAVA_OPTS=-Xmx768m -Xms256m

      SPRING_PROFILES_ACTIVE: prod

      JAVA_OPTS: -Xmx768m -Xms256m

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '1'

          memory: 1G

          cpus: '${TIME_SERIES_COMMANDS_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${TIME_SERIES_COMMANDS_RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          memory: 820M
 
          cpus: '${TIME_SERIES_COMMANDS_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${TIME_SERIES_COMMANDS_RESOURCES_RESERVATIONS_MEMORY:-820M}

deploy/docker-compose.time-series-commands.tmpl.yml

+25 −20
Original line number Diff line number Diff line
@@ -2,52 +2,57 @@ version: '3.5' 


services:

  time-series-commands:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/server/time-series}:${IMAGE_TAG:-latest}

    environment:

      - COMMANDS_PORT

      - SPRING_PROFILES_ACTIVE

      - OAUTH_CLIENT_ID

      - OAUTH_CLIENT_SECRET

      - MICROSERVICE_NAME=${UNIT_NAME}-commands

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

      PORT:

      SERVER_PORT: ${PORT}

      OAUTH_CLIENT_ID:

      OAUTH_CLIENT_SECRET:

      MICROSERVICE_NAME: ${UNIT_NAME}-commands

      SPRING_KAFKA_CLIENT-ID:

    networks:

      - metric-net

      - kafka-net

      - redmic-net

      - traefik-net

      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

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

      interval: ${TIME_SERIES_COMMANDS_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${TIME_SERIES_COMMANDS_HEALTHCHECK_TIMEOUT:-10s}

      retries: ${TIME_SERIES_COMMANDS_HEALTHCHECK_RETRIES:-3}

      start_period: ${TIME_SERIES_COMMANDS_HEALTHCHECK_START_PERIOD:-2m}

    deploy:

      mode: replicated

      replicas: 1

      replicas: ${TIME_SERIES_COMMANDS_REPLICAS:-1}

      labels:

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

        traefik.backend: ${UNIT_NAME}-commands

        traefik.port: "${COMMANDS_PORT}"

        traefik.port: '${PORT}'

      restart_policy:

        delay: 1m

        window: 3m

        delay: ${TIME_SERIES_COMMANDS_RESTART_DELAY:-15s}

      update_config:

        delay: ${TIME_SERIES_COMMANDS_UPDATE_DELAY:-5m}



networks:

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true



  kafka-net:

    name: ${KAFKA_NET_NAME:-kafka-net}

    driver: ${KAFKA_NET_DRIVER:-overlay}

    external: true



  redmic-net:

    name: ${REDMIC_NET_NAME:-redmic-net}

    driver: ${REDMIC_NET_DRIVER:-overlay}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true

deploy/docker-compose.time-series-view.dev.yml

+6 −8
Original line number Diff line number Diff line
@@ -3,15 +3,13 @@ version: '3.5' 
services:

  time-series-view:

    environment:

      - JAVA_OPTS=-Xmx768m -Xms256m

    ports:

      - target: ${VIEW_PORT}

        published: ${VIEW_PORT}

        mode: host

      SPRING_PROFILES_ACTIVE: pre

      JAVA_OPTS: -Xmx768m -Xms256m

    deploy:

      resources:

        limits:

          cpus: '1'

          memory: 1G

          cpus: '${TIME_SERIES_VIEW_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${TIME_SERIES_VIEW_RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          memory: 820M
 
          cpus: '${TIME_SERIES_VIEW_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${TIME_SERIES_VIEW_RESOURCES_RESERVATIONS_MEMORY:-820M}

deploy/docker-compose.time-series-view.prod.yml

+6 −7
Original line number Diff line number Diff line
@@ -3,14 +3,13 @@ version: '3.5' 
services:

  time-series-view:

    environment:

      - JAVA_OPTS=-Xmx768m -Xms256m

      SPRING_PROFILES_ACTIVE: prod

      JAVA_OPTS: -Xmx768m -Xms256m

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '1'

          memory: 1G

          cpus: '${TIME_SERIES_VIEW_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${TIME_SERIES_VIEW_RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          memory: 820M
 
          cpus: '${TIME_SERIES_VIEW_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${TIME_SERIES_VIEW_RESOURCES_RESERVATIONS_MEMORY:-820M}