update

docker-compose.yml

@@ -1,14 +1,3 @@
-# docker run -d \
-# --name="homeassistant" \
-# --net=host \
-# --restart on-failure \
-# --device=/dev/ttyACM0 \
-# -v /home/basti/Projects/homeassistant_config:/config \
-# -e "TZ=Europe/Berlin" \
-# -p 8123:8123 -p 8060:8060 \
-# homeassistant/home-assistant:0.101.3
-
-version: '3.3'
 services:
   homeassistant:
     container_name: homeassistant
@@ -26,33 +15,24 @@ services:
     network_mode: host
     depends_on:
       # - mariadb
-      - mariadb_1x
+      - postgres
+#      - mariadb_1x
       - mosquitto
       - zigbee2mqtt
 
-  mariadb_1x:
-    container_name: mariadb_1x
-    image: mariadb:10.11.2
+  postgres:
+    container_name: ha-postgres-db
+    image: postgres:15-alpine
+    env_file: .env
+    environment:
+      POSTGRES_DB: "${HA_DB_DATABASE}"
+      POSTGRES_PASSWORD: "${HA_DB_PASSWORD}"
+      POSTGRES_USER: "${HA_DB_USER}"
     restart: always
     ports:
-      - "3306:3306/tcp"
+      - 5433:5432
     volumes:
-      - /srv/docker/mariadb_1x/config:/etc/mysql/conf.d
-      - /srv/docker/mariadb_1x/data:/var/lib/mysql
-    environment:
-      TZ: ${TZ}
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MARIADB_AUTO_UPGRADE: "1"
-      MARIADB_INITDB_SKIP_TZINFO: "1"
-
-  # adminer:
-  #   image: adminer
-  #   restart: always
-  #   ports:
-  #     - 8080:18080
+      - ha-postgres-db:/var/lib/postgresql/data
 
   mosquitto:
     container_name: mosquitto
@@ -85,21 +65,7 @@ services:
     #user: "${LOCAL_USER}:${LOCAL_USER}"
     depends_on:
       - homeassistant
-  zwave-js:
-    image: zwavejs/zwavejs2mqtt:${ZWAVEJSTAG}
-    container_name: zwave-js
-    restart: unless-stopped
-    environment:
-      TZ: ${TZ}
-    depends_on:
-      - mosquitto
-    ports:
-      - 8091:8091
-      - 3001:3000
-    devices:
-      - /dev/ttyACM0:/dev/ttyACM0
-    volumes:
-      - /home/basti/Projects/smarthome/zwave-js:/usr/src/app/store
+
 
   zigbee2mqtt:
     container_name: zigbee2mqtt
@@ -108,9 +74,10 @@ services:
     depends_on:
       - mosquitto
     devices:
-      - /dev/ttyACM1
+#      - /dev/ttyACM0
+      - /dev/ttyUSB0
     volumes:
-      - ./zbdata:/app/data
+      - ./docker-data/z2m:/app/data
       - /run/udev:/run/udev:ro
     ports:
       - 8383:8080
@@ -124,3 +91,40 @@ volumes:
   mosquitto_data: {}
   zwavejs_data: {}
   zigbee2mqtt_data: {}
+  ha-postgres-db:
+    name: ha-postgres-db
+  # zwave-js:
+  #   image: zwavejs/zwavejs2mqtt:${ZWAVEJSTAG}
+  #   container_name: zwave-js
+  #   restart: unless-stopped
+  #   environment:
+  #     TZ: ${TZ}
+  #   depends_on:
+  #     - mosquitto
+  #   ports:
+  #     - 8091:8091
+  #     - 3001:3000
+  #   devices:
+  #     - /dev/ttyACM0:/dev/ttyACM0
+  #   volumes:
+  #     - /home/basti/Projects/smarthome/zwave-js:/usr/src/app/store
+
+  # mariadb_1x:
+  #   container_name: mariadb_1x
+  #   image: mariadb:10.11.2
+  #   restart: always
+  #   ports:
+  #     - "3306:3306/tcp"
+  #   volumes:
+  #     - /srv/docker/mariadb_1x/config:/etc/mysql/conf.d
+  #     - /srv/docker/mariadb_1x/data:/var/lib/mysql
+  #   environment:
+  #     TZ: ${TZ}
+  #     MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+  #     MYSQL_DATABASE: ${MYSQL_DATABASE}
+  #     MYSQL_USER: ${MYSQL_USER}
+  #     MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+  #     MARIADB_AUTO_UPGRADE: "1"
+  #     MARIADB_INITDB_SKIP_TZINFO: "1"
+
+