Merge branch 'dev' into 'master' (dfa042fc) · Commits · REDMIC Project / MQTT / VerneMQ

.gitlab-ci.yml

+9 −91

Original line number	Diff line number	Diff line
		include:
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/deployment.yml'

		stages:
		- deploy

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

		.deploy:
		variables:
		DOCKER_DRIVER: overlay2
		STACK: mqtt
		SERVICES_TO_CHECK: mqtt_${CI_PROJECT_NAME} mqtt_vmq-redis
		STATUS_CHECK_DELAY: 60
		VERNEMQ_IMAGE_TAG: ${VERNEMQ_IMAGE_TAG:-latest}
		REDIS_IMAGE_TAG: ${REDIS_IMAGE_TAG:-latest}

		services:
		- docker:dind

		deploy-supporting-branch-develop:
		stage: deploy
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${DEV_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}
		DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${DEV_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}
		script:
		- >
		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
		only:
		- branches
		except:
		- master
		when: manual

		deploy-stable-branch-develop:
		stage: deploy
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${DEV_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}
		DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${DEV_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}
		script:
		- >
		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
		only:
		- master
		when: manual

		deploy-supporting-branch-production:
		stage: deploy
		variables:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${PRO_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}
		DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${PRO_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}
		script:
		- >
		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
		only:
		- branches
		except:
		- master
		when: manual

		deploy-stable-branch-production:
		stage: deploy
		variables:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${PRO_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}
		DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${PRO_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}
		script:
		- >
		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
		only:
		- master
		when: manual

LICENSE

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		MIT License

		Copyright (c) 2019 REDMIC Project / MQTT

		Permission is hereby granted, free of charge, to any person obtaining a copy
		of this software and associated documentation files (the "Software"), to deal
		in the Software without restriction, including without limitation the rights
		to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		copies of the Software, and to permit persons to whom the Software is
		furnished to do so, subject to the following conditions:

		The above copyright notice and this permission notice shall be included in all
		copies or substantial portions of the Software.

		THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
		AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
		LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
		OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
		SOFTWARE.

deploy/.env

+7 −2

Original line number	Diff line number	Diff line
		SUBDOMAIN=mqtt
		DOCKER_VERNEMQ_ALLOW_ANONYMOUS=off
		DOCKER_VERNEMQ_LISTENER__HTTP__DEFAULT=127.0.0.1:8889
		DOCKER_IP_ADDRESS=0.0.0.0
		DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=changeme
		DOCKER_VERNEMQ_PLUGINS__VMQ_PASSWD=off
		@@ -9,3 +7,10 @@ DOCKER_VERNEMQ_PLUGINS__VMQ_DIVERSITY=on
		DOCKER_VERNEMQ_VMQ_DIVERSITY__AUTH_REDIS__ENABLED=on
		DOCKER_VERNEMQ_VMQ_DIVERSITY__REDIS__HOST=vmq-redis
		DOCKER_VERNEMQ_VMQ_DIVERSITY__REDIS__PORT=6379

		EXTERNAL_MQTT_PORT=1883
		MQTT_PORT=1883
		EXTERNAL_SECURE_MQTT_PORT=8883
		SECURE_MQTT_PORT=8883
		PORT_MODE=ingress
		REDIS_DATA_VOL_NAME=vernemq-redis-data-vol

deploy/docker-compose.dev.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,4 @@ version: '3.5'

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

deploy/docker-compose.prod.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ services:

		volumes:
		redis-data-vol:
		name: ${REDIS_DATA_VOL_NAME:-vernemq-redis-data-vol}
		name: ${REDIS_DATA_VOL_NAME}
		driver: 'cloudstor:aws'
		driver_opts:
		backing: shared