Commit ba36b780 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Simplifica variables y cambia subdominio

parent 94d1da59

build/Dockerfile

+2 −2
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_NAME \

    PARENT_IMAGE_TAG

ARG PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server \

    PARENT_IMAGE_TAG=latest



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}

deploy/.env

+4 −1
Original line number Diff line number Diff line 
IMAGE_NAME=registry.gitlab.com/redmic-project/server/time-series

IMAGE_TAG=latest



UNIT_NAME=time-series

MICROSERVICE_PORT=8080

SPRING_KAFKA_CLIENT_ID={{.Service.Name}}-{{.Task.Slot}}
@@ -5,5 +8,5 @@ JAVA_OPTS=-XX:MaxRAMFraction=2 


TRAEFIK_ENABLE=true

TRAEFIK_ENTRYPOINT=http

TRAEFIK_SUBDOMAIN=time-series

TRAEFIK_SUBDOMAIN=api

PUBLIC_HOSTNAME=change.me

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

+12 −12
Original line number Diff line number Diff line 
services:

  time-series-commands:

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

    image: ${IMAGE_NAME}:${IMAGE_TAG}

    environment:

      MICROSERVICE_NAME: ${UNIT_NAME}-commands

      MICROSERVICE_PORT:
@@ -18,17 +18,17 @@ services: 
      - commands-vol:/tmp/kafka

    healthcheck:

      test: wget --spider -q http://localhost:${MICROSERVICE_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:-5}

      start_period: ${TIME_SERIES_COMMANDS_HEALTHCHECK_START_PERIOD:-2m}

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-10s}

      retries: ${HEALTHCHECK_RETRIES:-5}

      start_period: ${HEALTHCHECK_START_PERIOD:-2m}

    deploy:

      mode: replicated

      replicas: ${TIME_SERIES_COMMANDS_REPLICAS:-1}

      replicas: ${REPLICAS:-1}

      restart_policy:

        delay: ${TIME_SERIES_COMMANDS_RESTART_DELAY:-15s}

        delay: ${RESTART_DELAY:-15s}

      update_config:

        delay: ${TIME_SERIES_COMMANDS_UPDATE_DELAY:-5m}

        delay: ${UPDATE_DELAY:-2m}

      labels:

        traefik.enable: ${TRAEFIK_ENABLE}

        traefik.http.routers.time-series-commands.entrypoints: ${TRAEFIK_ENTRYPOINT}
@@ -36,11 +36,11 @@ services: 
        traefik.http.services.time-series-commands.loadbalancer.server.port: ${MICROSERVICE_PORT}

      resources:

        limits:

          cpus: '${TIME_SERIES_COMMANDS_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${TIME_SERIES_COMMANDS_RESOURCES_LIMITS_MEMORY:-1G}

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          cpus: '${TIME_SERIES_COMMANDS_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${TIME_SERIES_COMMANDS_RESOURCES_RESERVATIONS_MEMORY:-820M}

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-820M}



networks:

  redmic-net:

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

+12 −12
Original line number Diff line number Diff line 
services:

  time-series-view:

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

    image: ${IMAGE_NAME}:${IMAGE_TAG}

    environment:

      MICROSERVICE_NAME: ${UNIT_NAME}-view

      MICROSERVICE_PORT:
@@ -20,17 +20,17 @@ services: 
      traefik-net:

    healthcheck:

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

      interval: ${TIME_SERIES_VIEW_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${TIME_SERIES_VIEW_HEALTHCHECK_TIMEOUT:-10s}

      retries: ${TIME_SERIES_VIEW_HEALTHCHECK_RETRIES:-5}

      start_period: ${TIME_SERIES_VIEW_HEALTHCHECK_START_PERIOD:-2m}

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-10s}

      retries: ${HEALTHCHECK_RETRIES:-5}

      start_period: ${HEALTHCHECK_START_PERIOD:-2m}

    deploy:

      mode: replicated

      replicas: ${TIME_SERIES_VIEW_REPLICAS:-1}

      replicas: ${REPLICAS:-1}

      restart_policy:

        delay: ${TIME_SERIES_VIEW_RESTART_DELAY:-15s}

        delay: ${RESTART_DELAY:-15s}

      update_config:

        delay: ${TIME_SERIES_VIEW_UPDATE_DELAY:-2m}

        delay: ${UPDATE_DELAY:-2m}

      labels:

        traefik.enable: ${TRAEFIK_ENABLE}

        traefik.http.routers.time-series-view.entrypoints: ${TRAEFIK_ENTRYPOINT}
@@ -38,11 +38,11 @@ services: 
        traefik.http.services.time-series-view.loadbalancer.server.port: ${MICROSERVICE_PORT}

      resources:

        limits:

          cpus: '${TIME_SERIES_VIEW_RESOURCES_LIMITS_CPUS:-1}'

          memory: ${TIME_SERIES_VIEW_RESOURCES_LIMITS_MEMORY:-1G}

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          cpus: '${TIME_SERIES_VIEW_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${TIME_SERIES_VIEW_RESOURCES_RESERVATIONS_MEMORY:-820M}

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-820M}



networks:

  redmic-net: