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

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/mqtt/vernemq!8
parents 9f157fff ed053d6e

.gitlab-ci.yml

+7 −2
Original line number Diff line number Diff line
@@ -6,8 +6,13 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: mqtt



.deploy:

  variables:

    STACK: mqtt

    SERVICES_TO_CHECK: mqtt_vmq-redis mqtt_${CI_PROJECT_NAME}

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_vmq-redis ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 60

  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

deploy/docker-compose.dev.yml

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



services:

  vmq-redis:

    deploy:

      placement:

        constraints:

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



volumes:

  redis-data-vol:

    name: ${REDIS_DATA_VOL_NAME}

deploy/docker-compose.tmpl.yml

+3 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ services: 
          memory: ${REDIS_RESOURCES_RESERVATIONS_MEMORY:-8M}



  vernemq:

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

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

    environment:

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS:

      DOCKER_IP_ADDRESS:
@@ -81,10 +81,12 @@ networks: 


  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true



volumes: