From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Wed, 8 Jan 2020 20:46:37 +0000 (+0100)
Subject: Fix vari
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=4c7e4c1ac66472a37d7e28dc922285ac0c4c2621;p=docker.git

Fix vari
---

diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml
index 1bcc7bc..db0dc9d 100644
--- a/portainer/docker-compose.yaml
+++ b/portainer/docker-compose.yaml
@@ -14,5 +14,4 @@ services:
     volumes:
       - ${DOCKER_CFG_DIR}/portainer:/data
       - /var/run/docker.sock:/var/run/docker.sock
-    network_mode: bridge
-
+    network_mode: host
diff --git a/xen-orchestra-ce/docker-compose.yml b/xen-orchestra-ce/docker-compose.yml
index d75b003..2cf7c85 100644
--- a/xen-orchestra-ce/docker-compose.yml
+++ b/xen-orchestra-ce/docker-compose.yml
@@ -1,42 +1,42 @@
 version: '3'
 
 services:
-    orchestra:
-        restart: unless-stopped
-        image: ezka77/xen-orchestra-ce
-        container_name: XO_server
-        ports:
-            - "8081:8000"
-        depends_on:
-            - redis
-        environment:
-            - DEBUG=xo:main
-            - NODE_ENV=production
-            - XOA_PLAN=5
-            # To enable XO superuser features (ex: NFS mount) on the host
-            # uncomment the following lines, it will start XO as superuser
-            # and enable the privileged capabilities for this container (access
-            # host devices, ...) NB: it's a security issue, so be warned !
-            #- USER=root
-            TZ: "Europe/Rome"
-        #privileged: true
-        volumes:
-            - xoa_data:/storage
-        logging: &logging
-            driver: "json-file"
-            options:
-                max-size: "1M"
-                max-file: "2"
-    redis:
-        restart: unless-stopped
-        container_name: XO_redis
-        image: redis:alpine
-        command: redis-server --appendonly yes
-        volumes:
-            - xoa_data:/data
-        logging:
-            <<: *logging
+  orchestra:
+    container_name: XO_server
+    image: ezka77/xen-orchestra-ce
+    restart: unless-stopped
+    ports:
+      - "8081:8000"
+    depends_on:
+      - redis
+    environment:
+      - DEBUG=xo:main
+      - NODE_ENV=production
+      - XOA_PLAN=5
+      # To enable XO superuser features (ex: NFS mount) on the host
+      # uncomment the following lines, it will start XO as superuser
+      # and enable the privileged capabilities for this container (access
+      # host devices, ...) NB: it's a security issue, so be warned !
+      #- USER=root
+    #privileged: true
+    volumes:
+      #- xoa_data:/storage
+      - ${DOCKER_CFG_DIR}/xoa_data:/storage
+#    network_mode: bridge
+    logging: &logging
+      driver: "json-file"
+      options:
+         max-size: "1M"
+         max-file: "2"
 
-volumes:
-    xoa_data: 
-        external: true
+  redis:
+    container_name: XO_redis
+    image: redis:alpine
+    command: redis-server --appendonly yes
+    restart: unless-stopped
+    volumes:
+      #- xoa_data:/data
+      - ${DOCKER_CFG_DIR}/xoa_data:/data
+#    network_mode: bridge
+    logging:
+      <<: *logging
diff --git a/zigbee2mqtt/docker-compose.yaml b/zigbee2mqtt/docker-compose.yaml
new file mode 100644
index 0000000..321a7db
--- /dev/null
+++ b/zigbee2mqtt/docker-compose.yaml
@@ -0,0 +1,16 @@
+version: '3'
+
+services:
+  zigbee2mqtt:
+    container_name: zigbee2mqtt
+    image: koenkk/zigbee2mqtt
+    restart: always
+    environment:
+      - TZ=${DOCKER_TZ}
+    privileged: true
+    volumes:
+      - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
+      - /run/udev:/run/udev:ro
+    devices:
+      - /dev/ttyACM0:/dev/ttyACM0
+    network_mode: host