changed namespace for device types and smartapps

sgupta999 · Nov 22, 2019 · 892cb72 · 892cb72
1 parent 034a17f
commit 892cb72
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 8 deletions.
diff --git a/DOCKER.md b/DOCKER.md
@@ -65,4 +65,35 @@ docker run -p:8080:8080 \
 		   --name mbs-rpi 
 		   sgupta99/mqtt-bridge-smartthings:1.0.3-rpi
 ```	   
-The RPI distro is about 768MB and Alpine is about 136MB - so I would still go for the alpine distro
+The RPI distro is about 768MB and Alpine is about 136MB - so I would still go for the alpine distro
+
+# Docker Compose
+
+If you want to bundle everything together, you can use [Docker Compose](https://docs.docker.com/compose/). This will install and run both mosquitto and MBS - you still need to make sure mosquitto.com and mbs config files are in the right directories.
+
+Just create a file called docker-compose.yml with these contents:
+```
+mqtt:
+    image: eclipse-mosquitto
+    container_name: mqtt
+    environment:
+        - TZ=America/Chicago
+    volumes:
+        - D:/data/docker/volumes/mosquitto/config:/mosquitto/config
+        - D:/data/docker/volumes/mosquitto/data:/mosquitto/data
+        - D:/data/docker/volumes/mosquitto/log:/mosquitto/log
+    ports:
+        - 1883:1883
+        - 9001:9001
+
+mqttbridge:
+    image: sgupta99/mqtt-bridge-smartthings:1.0.3-alpine
+    container_name: mbs
+    environment:
+        - TZ=America/Chicago
+    volumes:
+        - D:/data/docker/volumes/mbs:/mbs/config
+    ports:
+        - 8080:8080
+```
+
diff --git a/...other.src/ComboContactSensorSwitch.groovy → ...combo.src/ComboContactSensorSwitch.groovy b/...other.src/ComboContactSensorSwitch.groovy → ...combo.src/ComboContactSensorSwitch.groovy
diff --git a/...other.src/ComboSwitchContactSensor.groovy → ...combo.src/ComboSwitchContactSensor.groovy b/...other.src/ComboSwitchContactSensor.groovy → ...combo.src/ComboSwitchContactSensor.groovy
diff --git a/...es/gupta/mbs-bridge.src/mbs-bridge.groovy → ...pta/mqtt/mbs-bridge.src/mbs-bridge.groovy b/...es/gupta/mbs-bridge.src/mbs-bridge.groovy → ...pta/mqtt/mbs-bridge.src/mbs-bridge.groovy
@@ -26,7 +26,7 @@ import groovy.json.JsonSlurper
 import groovy.json.JsonOutput
 
 metadata {
-    definition (name: "MBS Bridge", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "MBS Bridge", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
         capability "Notification"
     }
 

diff --git a/...a/tasmota.src/TasmotaContactSensor.groovy → ...t/tasmota.src/TasmotaContactSensor.groovy b/...a/tasmota.src/TasmotaContactSensor.groovy → ...t/tasmota.src/TasmotaContactSensor.groovy
@@ -20,7 +20,7 @@
 
 metadata {
 
-    definition (name: "Tasmota Contact Sensor", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota Contact Sensor", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
         capability "Contact Sensor"	
 		capability "Actuator"
 		capability "Refresh"

diff --git a/...ta/tasmota.src/TasmotaSensorSwitch.groovy → ...tt/tasmota.src/TasmotaSensorSwitch.groovy b/...ta/tasmota.src/TasmotaSensorSwitch.groovy → ...tt/tasmota.src/TasmotaSensorSwitch.groovy
@@ -20,7 +20,7 @@
 
 metadata {
 
-    definition (name: "Tasmota SensorSwitch", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota SensorSwitch", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
 		capability "Actuator"
         capability "Contact Sensor"	
         capability "Switch"

diff --git a/...es/gupta/tasmota.src/TasmotaSwitch.groovy → ...pta/mqtt/tasmota.src/TasmotaSwitch.groovy b/...es/gupta/tasmota.src/TasmotaSwitch.groovy → ...pta/mqtt/tasmota.src/TasmotaSwitch.groovy
@@ -20,7 +20,7 @@
 
 metadata {
 
-    definition (name: "Tasmota Switch", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota Switch", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
 		capability "Actuator"
         capability "Switch"
 		capability "Refresh"

diff --git a/...ta/tasmota.src/TasmotaSwitchSensor.groovy → ...tt/tasmota.src/TasmotaSwitchSensor.groovy b/...ta/tasmota.src/TasmotaSwitchSensor.groovy → ...tt/tasmota.src/TasmotaSwitchSensor.groovy
@@ -20,7 +20,7 @@
 
 metadata {
 
-    definition (name: "Tasmota SwitchSensor", namespace: "gupta", author: "Sandeep Gupta") {
+    definition (name: "Tasmota SwitchSensor", namespace: "gupta/mqtt", author: "Sandeep Gupta") {
 		capability "Actuator"
         capability "Switch"
 		capability "Momentary"

diff --git a/...mbs-smartapp.src/mbs-smartapp-full.groovy → ...mbs-smartapp.src/mbs-smartapp-full.groovy b/...mbs-smartapp.src/mbs-smartapp-full.groovy → ...mbs-smartapp.src/mbs-smartapp-full.groovy
@@ -467,7 +467,7 @@ import groovy.transform.Field
 
 definition(
     name: "MBS SmartApp Full",
-    namespace: "gupta",
+    namespace: "gupta/mqtt",
     author: "Sandeep Gupta",
     description: "An MQTT bridge to SmartThings [MBS-SmartApp-Full]",
     category: "My Apps",

diff --git a/...mbs-smartapp.src/mbs-smartapp-lite.groovy → ...mbs-smartapp.src/mbs-smartapp-lite.groovy b/...mbs-smartapp.src/mbs-smartapp-lite.groovy → ...mbs-smartapp.src/mbs-smartapp-lite.groovy
@@ -96,7 +96,7 @@ import groovy.transform.Field
 
 definition(
     name: "MBS SmartApp Lite",
-    namespace: "gupta",
+    namespace: "gupta/mqtt",
     author: "Sandeep Gupta",
     description: "An MQTT bridge to SmartThings [MBS-SmartApp-Lite]",
     category: "My Apps",