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

Merge branch 'dev' into 'master' 

Ajusta detalles de despliegue

See merge request redmic-project/mqtt/vernemq!5
parents dfa042fc e7af23c7

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@ stages: 
.deploy:

  variables:

    STACK: mqtt

    SERVICES_TO_CHECK: mqtt_${CI_PROJECT_NAME} mqtt_vmq-redis

    SERVICES_TO_CHECK: mqtt_vmq-redis mqtt_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 60

deploy/docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  vernemq:

  vmq-redis:

    deploy:

      placement:

        constraints:

          - node.role == worker



  vmq-redis:

  vernemq:

    deploy:

      placement:

        constraints:

deploy/docker-compose.tmpl.yml

+22 −22
Original line number Diff line number Diff line 
version: '3.5'



services:

  vmq-redis:

    image: ${REDIS_IMAGE_NAME:-redis}:${REDIS_IMAGE_TAG:-alpine}

    command: redis-server --appendonly yes

    networks:

      vernemq-net:

    volumes:

      - redis-data-vol:/data

    deploy:

      mode: replicated

      replicas: ${REDIS_REPLICAS:-1}

      restart_policy:

        delay: ${REDIS_RESTART_DELAY:-5s}

      update_config:

        delay: ${REDIS_UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${REDIS_RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${REDIS_RESOURCES_LIMITS_MEMORY:-32M}

        reservations:

          cpus: '${REDIS_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${REDIS_RESOURCES_RESERVATIONS_MEMORY:-8M}



  vernemq:

    image: ${VERNEMQ_IMAGE_NAME:-erlio/docker-vernemq}:${VERNEMQ_IMAGE_TAG:-latest-alpine}

    environment:
@@ -49,28 +71,6 @@ services: 
          cpus: '${VERNEMQ_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${VERNEMQ_RESOURCES_RESERVATIONS_MEMORY:-80M}



  vmq-redis:

    image: ${REDIS_IMAGE_NAME:-redis}:${REDIS_IMAGE_TAG:-latest}

    command: redis-server --appendonly yes

    networks:

      vernemq-net:

    volumes:

      - redis-data-vol:/data

    deploy:

      mode: replicated

      replicas: ${REDIS_REPLICAS:-1}

      restart_policy:

        delay: ${REDIS_RESTART_DELAY:-5s}

      update_config:

        delay: ${REDIS_UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${REDIS_RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${REDIS_RESOURCES_LIMITS_MEMORY:-64M}

        reservations:

          cpus: '${REDIS_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${REDIS_RESOURCES_RESERVATIONS_MEMORY:-16M}



networks:

  vernemq-net:

    name: ${VERNEMQ_NET_NAME:-vernemq-net}