Browse Source

Change devel

Joachim M. Giæver 3 years ago
parent
commit
841cdef936
3 changed files with 15 additions and 24 deletions
  1. 2 2
      snap/snapcraft.yaml
  2. 0 22
      src/services/ozwdaemon/docker-compose.yml
  3. 13 0
      src/wrapper

+ 2 - 2
snap/snapcraft.yaml

@@ -8,8 +8,8 @@ description: |
   we live in tweetspace and your description wants to look good in the snap
   store.
 
-grade: stable
-confinement: strict
+grade: devel
+confinement: devmode
 
 plugs:
   docker-executables:

+ 0 - 22
src/services/ozwdaemon/docker-compose.yml

@@ -1,22 +0,0 @@
-version: '3'
-services:
-  ozwd:
-    image: openzwave/ozwdaemon:allinone-latest
-    container_name: "ozwd"
-    security_opt:
-      - seccomp:unconfined
-    devices:
-      - "/dev/ttyUSB0"
-    volumes:
-      - ./ozw:/opt/ozw/config
-    ports:
-      - "1983:1983"
-      - "5901:5901"
-      - "7800:7800"
-    environment:
-      MQTT_SERVER: "192.168.0.1"
-      MQTT_USERNAME: "my-username"
-      MQTT_PASSWORD: "my-password"
-      USB_PATH: "/dev/ttyUSB0"
-      OZW_NETWORK_KEY: "0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00"
-    restart: unless-stopped

+ 13 - 0
src/wrapper

@@ -16,7 +16,20 @@ fi
 
 COMPOSE_FILE="${SNAP}/services/ozwdaemon/docker-compose.yml"
 
+USB_PATH=$(snapctl get usb-path)
+MQTT_SERVER=$(snapctl get mqtt.server)
+MQTT_PORT=$(snapctl get mqtt.port)
+MQTT_USERNAME=$(snapctl get mqtt.username)
+MQTT_PASSWORD=$(snapctl get mqtt.password)
+MQTT_TLS=$(snapctl get mqtt.tls)
+MQTT_CONNECT_TIMEOUT=$(snapctl get mqtt.connect-timeout)
+STOP_ON_FAILURE=$(snapctl get stop-on-failure)
+OZW_NETWORK_KEY=$(snapctl get ozw.network_key)
+OZW_INSTANCE=$(snapctl get ozw.instance)
+
 #$SNAP/docker-snap/bin/docker-compose -f $COMPOSE_FILE up -d
+
+# ALL IN ONE
 # $SNAP/docker-snap/bin/docker run -it \
 #     --security-opt seccomp=unconfined \
 #     --device=/dev/ttyUSB0 \