Commit 0904763a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Cambia volumen de redis desde ebs a efs

See merge request redmic-project/mqtt/vernemq!2
parents f4dd2b3c 40a05640

.gitlab-ci.yml

+11 −10
Original line number Diff line number Diff line 
stages:

  - deploy



image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}



variables:

  DOCKER_DRIVER: overlay2

  STACK: mqtt

  SERVICES_TO_CHECK: mqtt_${CI_PROJECT_NAME} mqtt_vmq-redis

  STATUS_CHECK_DELAY: 60

  IMAGE_TAG: ${VERNEMQ_IMAGE_TAG:-latest}

  VERNEMQ_IMAGE_TAG: ${VERNEMQ_IMAGE_TAG:-latest}

  REDIS_IMAGE_TAG: ${REDIS_IMAGE_TAG:-latest}



services:

  - docker:dind
@@ -23,8 +24,8 @@ deploy-supporting-branch-develop: 
    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${DEV_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      deploy.sh VERNEMQ_IMAGE_TAG=${VERNEMQ_IMAGE_TAG} REDIS_IMAGE_TAG=${REDIS_IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: dev
@@ -44,8 +45,8 @@ deploy-stable-branch-develop: 
    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${DEV_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      deploy.sh VERNEMQ_IMAGE_TAG=${VERNEMQ_IMAGE_TAG} REDIS_IMAGE_TAG=${REDIS_IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: dev
@@ -63,8 +64,8 @@ deploy-supporting-branch-production: 
    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${PRO_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      deploy.sh VERNEMQ_IMAGE_TAG=${VERNEMQ_IMAGE_TAG} REDIS_IMAGE_TAG=${REDIS_IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: pro
@@ -84,8 +85,8 @@ deploy-stable-branch-production: 
    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${PRO_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      deploy.sh VERNEMQ_IMAGE_TAG=${VERNEMQ_IMAGE_TAG} REDIS_IMAGE_TAG=${REDIS_IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: pro

deploy/docker-compose.prod.yml

+7 −3
Original line number Diff line number Diff line
@@ -7,11 +7,15 @@ services: 
        constraints:

          - node.role == worker



  vmq-redis:

    deploy:

      placement:

        constraints:

          - node.role == worker



volumes:

  redis-data-vol:

    name: ${REDIS_DATA_VOL_NAME:-vernemq-redis-data-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2
 
      backing: shared

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


services:

  vernemq:

    image: erlio/docker-vernemq:${IMAGE_TAG:-latest}

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

    environment:

      - DOCKER_VERNEMQ_ALLOW_ANONYMOUS

      - DOCKER_VERNEMQ_LISTENER__HTTP__DEFAULT