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

Actualiza y completa config de docker 

Añade valores por defecto en Dockerfile y .env
Actualiza docker-compose añadiendo variables y modificando estructura
Añade SPRING_PROFILES_ACTIVE en docker-compose
parent 9bb56868

Dockerfile

+2 −6
Original line number Diff line number Diff line
@@ -6,11 +6,7 @@ FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG} 
COPY /*/dist/*.jar ./



ARG PORT=8080



EXPOSE ${PORT}



HEALTHCHECK \

	--interval=30s \

	--timeout=15s \

	--start-period=3m \

	--retries=10 \

CMD wget --spider -q http://localhost:${PORT}/api/${UNIT_NAME}/${MICROSERVICE_PATH}/actuator/health
 
ENV PORT=${PORT}

deploy/.env

+5 −0
Original line number Diff line number Diff line 
PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server

PARENT_IMAGE_TAG=latest



UNIT_NAME=atlas

PORT=8080

SPRING_KAFKA_CLIENT_ID={{.Service.Name}}-{{.Task.Slot}}

JAVA_OPTS=-XX:MaxRAMFraction=2

deploy/docker-compose.atlas-commands.dev.yml

+10 −5
Original line number Diff line number Diff line
@@ -2,15 +2,20 @@ version: '3.5' 


services:

  atlas-commands:

    environment:

      SPRING_PROFILES_ACTIVE: pre

    deploy:

      placement:

        constraints:

          - node.hostname == ${ATLAS_COMMANDS_PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

          cpus: '${ATLAS_COMMANDS_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${ATLAS_COMMANDS_RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          cpus: '0.01'

          memory: 410M

          cpus: '${ATLAS_COMMANDS_RESOURCES_RESERVATIONS_CPUS:-0.01}'

          memory: ${ATLAS_COMMANDS_RESOURCES_RESERVATIONS_MEMORY:-410M}



volumes:

  commands-vol:

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

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

+7 −8
Original line number Diff line number Diff line
@@ -2,21 +2,20 @@ version: '3.5' 


services:

  atlas-commands:

    environment:

      SPRING_PROFILES_ACTIVE: prod

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

          cpus: '${ATLAS_COMMANDS_RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${ATLAS_COMMANDS_RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          cpus: '0.01'

          memory: 410M

          cpus: '${ATLAS_COMMANDS_RESOURCES_RESERVATIONS_CPUS:-0.01}'

          memory: ${ATLAS_COMMANDS_RESOURCES_RESERVATIONS_MEMORY:-410M}



volumes:

  commands-vol:

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

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

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared

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

+27 −16
Original line number Diff line number Diff line
@@ -4,46 +4,57 @@ services: 
  atlas-commands:

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

    environment:

      - UNIT_NAME

      - MICROSERVICE_PATH=commands

      - PORT

      - SPRING_PROFILES_ACTIVE

      - OAUTH_CLIENT_ID

      - OAUTH_CLIENT_SECRET

      - MICROSERVICE_NAME=${UNIT_NAME}-commands

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

      - JAVA_OPTS=-XX:MaxRAMFraction=2

      UNIT_NAME:

      MICROSERVICE_PATH: commands

      PORT:

      SERVER_PORT: ${PORT}

      OAUTH_CLIENT_ID:

      OAUTH_CLIENT_SECRET:

      MICROSERVICE_NAME: ${UNIT_NAME}-commands

      SPRING_KAFKA_CLIENT_ID:

      JAVA_OPTS:

    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 -q http://localhost:${MICROSERVICE_PORT}/${MICROSERVICE_NAME}/actuator/health

      interval: ${ATLAS_COMMANDS_HEALTHCHECK_INTERVAL:-30s}

      timeout: ${ATLAS_COMMANDS_HEALTHCHECK_TIMEOUT:-15s}

      retries: ${ATLAS_COMMANDS_HEALTHCHECK_RETRIES:-10}

      start_period: ${ATLAS_COMMANDS_HEALTHCHECK_START_PERIOD:-3m}

    deploy:

      mode: replicated

      replicas: 1

      replicas: ${REPLICAS:-1}

      labels:

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

        traefik.backend: ${UNIT_NAME}-commands

        traefik.port: '${PORT}'

      restart_policy:

        delay: 10s

        window: 3m

        delay: ${ATLAS_COMMANDS_RESTART_DELAY:-15s}

      update_config:

        delay: ${ATLAS_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