From b4491ee4d2eb38010179d39398829ca1514b937c Mon Sep 17 00:00:00 2001 From: Divine Threepwood Date: Thu, 21 Jul 2022 20:40:41 +0200 Subject: [PATCH 1/3] continue on docker compose file by setting up mosquitto. --- docker/docker-compose-homecube.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/docker-compose-homecube.yml b/docker/docker-compose-homecube.yml index d939f98275..e2a7d81225 100644 --- a/docker/docker-compose-homecube.yml +++ b/docker/docker-compose-homecube.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.9" volumes: database_data: @@ -8,10 +8,16 @@ volumes: services: mosquitto: - build: ./mosquitto - image: "prodaso/mosquitto" + image: mosquitto ports: - - "8884:8884" + - "1883:1883" + volumes: $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf + restart: always + logging: + driver: local + detach: true + + postgres: build: ./postgres image: "prodaso/postgres" From a87a85774348662b5a8c847470f8d14dbbacaaf1 Mon Sep 17 00:00:00 2001 From: Lukas Panhorst Date: Thu, 16 May 2024 21:04:25 +0200 Subject: [PATCH 2/3] [Issue 64] Introduce docker compose for bco dist --- docker/deploy_homecube.sh | 25 +++ docker/docker-compose-copilot.yml | 235 +++++++++++++++++++++++++++++ docker/docker-compose-demo.yaml | 44 ++++++ docker/docker-compose-homecube.yml | 150 +++++++++++++++--- docker/run_docker.sh | 31 ++++ 5 files changed, 462 insertions(+), 23 deletions(-) create mode 100644 docker/deploy_homecube.sh create mode 100644 docker/docker-compose-copilot.yml create mode 100644 docker/docker-compose-demo.yaml create mode 100755 docker/run_docker.sh diff --git a/docker/deploy_homecube.sh b/docker/deploy_homecube.sh new file mode 100644 index 0000000000..91401424dd --- /dev/null +++ b/docker/deploy_homecube.sh @@ -0,0 +1,25 @@ +!/bin/bash + +echo -e "allow_anonymous true\nlistener 1883" > $HOME/.mosquitto.conf + +# Create users and groups +sudo adduser --system --shell /usr/sbin/nologin openhab +sudo addgroup --system openhab +sudo usermod -a -G openhab openhab +sudo usermod -a -G dialout openhab +sudo usermod -a -G tty openhab +sudo usermod -a -G openhab ${DEFAULT_USER} + +sudo adduser --system --shell /usr/sbin/nologin bco +sudo addgroup --system bco +sudo usermod -a -G bco bco +sudo usermod -a -G bco ${DEFAULT_USER} + +# Set environment variables +export USER_ID=$(id -u openhab) +export GROUP_ID=$(getent group openhab | cut -d: -f3) +export BCO_USER_ID=$(id -u bco) +export BCO_GROUP_ID=$(getent group bco | cut -d: -f3) + +# Run docker-compose +docker-compose -f docker-compose-copilot.yml up --detach \ No newline at end of file diff --git a/docker/docker-compose-copilot.yml b/docker/docker-compose-copilot.yml new file mode 100644 index 0000000000..2fd2ab65a2 --- /dev/null +++ b/docker/docker-compose-copilot.yml @@ -0,0 +1,235 @@ +version: '3.8' +services: + mqtt-broker: + image: eclipse-mosquitto + networks: + - bco-net + volumes: + - $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf + ports: + - 1883:1883 + restart: always + logging: + driver: local + + # sudo docker run \ + # --name mqtt-broker \ + # --network=bco-net \ + # --publish 1883:1883 \ + # --volume $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf \ + # --restart=always \ + # --log-driver=local \ + # --detach \ + # eclipse-mosquitto + + openhab: + image: openhab/openhab:4.0.4 + networks: + - bco-net + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - openhab_conf:/openhab/conf + - openhab_userdata:/openhab/userdata + - openhab_addons:/openhab/addons + ports: + - 8080:8080 + - 8443:8443 + environment: + # - USER_ID=${USER_ID} + # - GROUP_ID=${GROUP_ID} + - CRYPTO_POLICY=unlimited + restart: always + logging: + driver: local + + # sudo docker run \ + # --name openhab \ + # --network=bco-net \ + # --publish 8080:8080 \ + # --publish 8443:8443 \ + # --volume /etc/localtime:/etc/localtime:ro \ + # --volume /etc/timezone:/etc/timezone:ro \ + # --volume openhab_conf:/openhab/conf \ + # --volume openhab_userdata:/openhab/userdata \ + # --volume openhab_addons:/openhab/addons \ + # --detach \ + # --env USER_ID=$(id -u openhab) \ + # --env GROUP_ID=$(getent group openhab | cut -d: -f3) \ + # --env CRYPTO_POLICY=unlimited \ + # --restart=always \ + # --log-driver=local \ + # $ZWAVE_STICK \ + # openhab/openhab:4.0.4 + + bco: + image: openbaseorg/bco:stable + networks: + - bco-net + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - bco_data:/home/bco/data + ports: + - 13781:13781 + # environment: + # - USER_ID=${BCO_USER_ID} + # - GROUP_ID=${BCO_GROUP_ID} + # - BCO_OPTIONS='--host mqtt-broker' + restart: always + logging: + driver: local + tty: true + + # sudo docker run \ + # --name bco \ + # --network=bco-net \ + # --publish 13781:13781 \ + # --volume /etc/localtime:/etc/localtime:ro \ + # --volume /etc/timezone:/etc/timezone:ro \ + # --volume bco_data:/home/bco/data \ + # --detach \ + # --env USER_ID=$(id -u bco) \ + # --env GROUP_ID=$(getent group bco | cut -d: -f3) \ + # --env BCO_OPTIONS='--host mqtt-broker' \ + # --restart=always \ + # --log-driver=local \ + # --tty \ + # openbaseorg/bco:stable + + + bco-device-manager-openhab: + image: openbaseorg/bco-device-manager-openhab:stable + networks: + - bco-net + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - bco_data:/home/bco/data + - openhab_conf:/etc/openhab2 + # environment: + # - USER_ID=${BCO_USER_ID} + # - GROUP_ID=${BCO_GROUP_ID} + # - OPENHAB_GROUP_ID=${OPENHAB_GROUP_ID} + # - BCO_OPTIONS='--host mqtt-broker --openhab-url http://openhab:8080' + restart: always + logging: + driver: local + tty: true + + # sudo docker run \ + # --name bco-device-manager-openhab \ + # --network=bco-net \ + # --volume /etc/localtime:/etc/localtime:ro \ + # --volume /etc/timezone:/etc/timezone:ro \ + # --volume bco_data:/home/bco/data \ + # --volume openhab_conf:/etc/openhab2 \ + # --detach \ + # --env USER_ID=$(id -u bco) \ + # --env GROUP_ID=$(getent group bco | cut -d: -f3) \ + # --env OPENHAB_GROUP_ID=$(getent group openhab | cut -d: -f3) \ + # --env BCO_OPTIONS='--host mqtt-broker --openhab-url http://openhab:8080' \ + # --restart=always \ + # --log-driver=local \ + # --tty \ + # openbaseorg/bco-device-manager-openhab:stable + + bco-webapp: + image: opaal/bco-ui-albiorix:latest + networks: + - bco-net + ports: + - 80:80 + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + restart: always + logging: + driver: local + + # sudo docker run \ + # --name bco-webapp \ + # --publish 80:80 \ + # --volume /etc/localtime:/etc/localtime:ro \ + # --volume /etc/timezone:/etc/timezone:ro \ + # --detach \ + # --restart=always \ + # --log-driver=local \ + # -tty \ + # opaal/bco-ui-albiorix:latest + + portainer: + image: portainer/portainer-ce + networks: + - bco-net + ports: + - 8000:8000 + - 9000:9000 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - portainer_data:/data + restart: always + logging: + driver: local + +# sudo docker volume create portainer_data +# sudo docker run \ +# --detach \ +# --publish 8000:8000 \ +# --publish 9000:9000 \ +# --name portainer \ +# --restart=always \ +# --log-driver=local \ +# --volume /var/run/docker.sock:/var/run/docker.sock \ +# --volume portainer_data:/data \ +# portainer/portainer-ce + + watchtower: + image: containrrr/watchtower:latest + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /etc/timezone:/etc/timezone:ro + environment: + - WATCHTOWER_CLEANUP=true + - WATCHTOWER_INCLUDE_STOPPED=true + - WATCHTOWER_TIMEOUT=60 + restart: always + logging: + driver: local + +# sudo docker run -d \ +# --name watchtower \ +# -v /var/run/docker.sock:/var/run/docker.sock \ +# -v /etc/timezone:/etc/timezone:ro \ +# --restart=always \ +# --log-driver=local \ +# --env WATCHTOWER_CLEANUP=true \ +# --env WATCHTOWER_INCLUDE_STOPPED=true \ +# --env WATCHTOWER_TIMEOUT=60 \ +# containrrr/watchtower:latest + + influxdb: + image: influxdb:latest + networks: + - bco-net + ports: + - 8086:8086 + volumes: + - influx_data:/var/lib/influxdb2 + - influx_config:/etc/influxdb2 + restart: always + logging: + driver: local + +networks: + bco-net: + driver: bridge + +volumes: + openhab_conf: + openhab_userdata: + openhab_addons: + bco_data: + influx_data: + influx_config: + portainer_data: \ No newline at end of file diff --git a/docker/docker-compose-demo.yaml b/docker/docker-compose-demo.yaml new file mode 100644 index 0000000000..695d07db24 --- /dev/null +++ b/docker/docker-compose-demo.yaml @@ -0,0 +1,44 @@ +networks: + bco-net: + driver: bridge + +services: + mosquitto: + image: eclipse-mosquitto + networks: + - bco-net + ports: + - "1883:1883" + volumes: + - $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf + restart: always + logging: + driver: local + + bco-demo: + image: openbaseorg/bco-demo:stable + networks: + - bco-net + ports: + - "13781:13781" + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + environment: + BCO_OPTIONS: '--db /tmp/bco/db --simulate' + logging: + driver: local + tty: true + + bco-webapp: + image: opaal/bco-ui-albiorix:latest + networks: + - bco-net + ports: + - 80:80 + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + restart: always + logging: + driver: local \ No newline at end of file diff --git a/docker/docker-compose-homecube.yml b/docker/docker-compose-homecube.yml index e2a7d81225..68a3aef7e3 100644 --- a/docker/docker-compose-homecube.yml +++ b/docker/docker-compose-homecube.yml @@ -1,35 +1,139 @@ -version: "3.9" +services: + mqtt-broker: + image: eclipse-mosquitto + networks: + - bco-net + volumes: + - $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf + ports: + - 1883:1883 + restart: always + logging: + driver: local -volumes: - database_data: - driver: local - customer_data: - driver: local + openhab: + image: openhab/openhab:4.0.4 + networks: + - bco-net + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - openhab_conf:/openhab/conf + - openhab_userdata:/openhab/userdata + - openhab_addons:/openhab/addons + ports: + - 8080:8080 + - 8443:8443 + environment: + - USER_ID=${USER_ID} + - GROUP_ID=${GROUP_ID} + - CRYPTO_POLICY=unlimited + restart: always + logging: + driver: local -services: - mosquitto: - image: mosquitto + bco: + image: openbaseorg/bco:stable + networks: + - bco-net + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - bco_data:/home/bco/data ports: - - "1883:1883" - volumes: $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf + - 13781:13781 + environment: + - USER_ID=${BCO_USER_ID} + - GROUP_ID=${BCO_GROUP_ID} + - BCO_OPTIONS='--host mqtt-broker' restart: always logging: driver: local - detach: true + tty: true + bco-device-manager-openhab: + image: openbaseorg/bco-device-manager-openhab:stable + networks: + - bco-net + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + - bco_data:/home/bco/data + - openhab_conf:/etc/openhab2 + environment: + - USER_ID=${BCO_USER_ID} + - GROUP_ID=${BCO_GROUP_ID} + - OPENHAB_GROUP_ID=${OPENHAB_GROUP_ID} + - BCO_OPTIONS='--host mqtt-broker --openhab-url http://openhab:8080' + restart: always + logging: + driver: local + tty: true - postgres: - build: ./postgres - image: "prodaso/postgres" + bco-webapp: + image: opaal/bco-ui-albiorix:latest + networks: + - bco-net ports: - - "5432:5432" + - 80:80 volumes: - - database_data:/var/lib/postgresql/data + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + restart: always + logging: + driver: local + + portainer: + image: portainer/portainer-ce + networks: + - bco-net + ports: + - 8000:8000 + - 9000:9000 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - portainer_data:/data + restart: always + logging: + driver: local + + watchtower: + image: containrrr/watchtower:latest + networks: + - bco-net + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /etc/timezone:/etc/timezone:ro environment: - POSTGRES_USER: "prodaso" - POSTGRES_PASSWORD: "iMqU8sJk" - mailhog: - build: "mailhog" + - WATCHTOWER_CLEANUP=true + - WATCHTOWER_INCLUDE_STOPPED=true + - WATCHTOWER_TIMEOUT=60 + restart: always + logging: + driver: local + + influxdb: + image: influxdb:latest + networks: + - bco-net ports: - - "127.0.0.1:8025:8025" - - "127.0.0.1:1025:1025" + - 8086:8086 + volumes: + - influx_data:/var/lib/influxdb2 + - influx_config:/etc/influxdb2 + restart: always + logging: + driver: local + +networks: + bco-net: + driver: bridge + +volumes: + openhab_conf: + openhab_userdata: + openhab_addons: + bco_data: + influx_data: + influx_config: + portainer_data: \ No newline at end of file diff --git a/docker/run_docker.sh b/docker/run_docker.sh new file mode 100755 index 0000000000..819ec84199 --- /dev/null +++ b/docker/run_docker.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# echo -e "allow_anonymous true\nlistener 1883" > $HOME/.mosquitto.conf + +# Create users and groups +# sudo adduser --system --shell /usr/sbin/nologin openhab +# sudo addgroup --system openhab +# sudo usermod -a -G openhab openhab +# sudo usermod -a -G dialout openhab +# sudo usermod -a -G tty openhab +# sudo usermod -a -G openhab ${DEFAULT_USER} + +# sudo adduser --system --shell /usr/sbin/nologin bco +# sudo addgroup --system bco +# sudo usermod -a -G bco bco +# sudo usermod -a -G bco ${DEFAULT_USER} + +# Set environment variables +# export USER_ID=$(id -u openhab) +# export GROUP_ID=$(getent group openhab | cut -d: -f3) +# export BCO_USER_ID=$(id -u bco) +# export BCO_GROUP_ID=$(getent group bco | cut -d: -f3) + +export USER_ID=openhab +export GROUP_ID=1000 +export BCO_USER_ID=1100 +export BCO_GROUP_ID=1150 +export OPENHAB_GROUP_ID=1200 + +# Run docker-compose +docker-compose -f docker-compose-copilot.yml up #--detach \ No newline at end of file From fc4f0bc6ffe8ca9fae4c778eaf496bc892f1bab6 Mon Sep 17 00:00:00 2001 From: Lukas Panhorst Date: Tue, 17 Sep 2024 20:41:07 +0200 Subject: [PATCH 3/3] clean up & add demo deployment --- docker/deploy_demo.sh | 5 + docker/deploy_homecube.sh | 10 +- docker/docker-compose-copilot.yml | 235 ------------------ docker/docker-compose-demo.yaml | 2 +- ...ecube.yml => docker-compose-homecube.yaml} | 2 +- docker/run_docker.sh | 31 --- 6 files changed, 15 insertions(+), 270 deletions(-) create mode 100755 docker/deploy_demo.sh mode change 100644 => 100755 docker/deploy_homecube.sh delete mode 100644 docker/docker-compose-copilot.yml rename docker/{docker-compose-homecube.yml => docker-compose-homecube.yaml} (99%) delete mode 100755 docker/run_docker.sh diff --git a/docker/deploy_demo.sh b/docker/deploy_demo.sh new file mode 100755 index 0000000000..f925e59cf0 --- /dev/null +++ b/docker/deploy_demo.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +echo -e "allow_anonymous true\nlistener 1883" > $HOME/.mosquitto.conf + +docker compose -f docker-compose-demo.yaml up -d --force-recreate \ No newline at end of file diff --git a/docker/deploy_homecube.sh b/docker/deploy_homecube.sh old mode 100644 new mode 100755 index 91401424dd..a9457045a6 --- a/docker/deploy_homecube.sh +++ b/docker/deploy_homecube.sh @@ -1,4 +1,7 @@ -!/bin/bash +#!/bin/bash + +export DEFAULT_USER=$(whoami) +sudo usermod -aG docker ${DEFAULT_USER} echo -e "allow_anonymous true\nlistener 1883" > $HOME/.mosquitto.conf @@ -21,5 +24,8 @@ export GROUP_ID=$(getent group openhab | cut -d: -f3) export BCO_USER_ID=$(id -u bco) export BCO_GROUP_ID=$(getent group bco | cut -d: -f3) +sudo chmod -R g+rwX /var/lib/docker/volumes/openhab_conf/_data/sitemaps +sudo chgrp bco /var/lib/docker/volumes/openhab_conf/_data/sitemaps + # Run docker-compose -docker-compose -f docker-compose-copilot.yml up --detach \ No newline at end of file +docker compose -f docker-compose-homecube.yaml up --detach --force-recreate \ No newline at end of file diff --git a/docker/docker-compose-copilot.yml b/docker/docker-compose-copilot.yml deleted file mode 100644 index 2fd2ab65a2..0000000000 --- a/docker/docker-compose-copilot.yml +++ /dev/null @@ -1,235 +0,0 @@ -version: '3.8' -services: - mqtt-broker: - image: eclipse-mosquitto - networks: - - bco-net - volumes: - - $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf - ports: - - 1883:1883 - restart: always - logging: - driver: local - - # sudo docker run \ - # --name mqtt-broker \ - # --network=bco-net \ - # --publish 1883:1883 \ - # --volume $HOME/.mosquitto.conf:/mosquitto/config/mosquitto.conf \ - # --restart=always \ - # --log-driver=local \ - # --detach \ - # eclipse-mosquitto - - openhab: - image: openhab/openhab:4.0.4 - networks: - - bco-net - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - openhab_conf:/openhab/conf - - openhab_userdata:/openhab/userdata - - openhab_addons:/openhab/addons - ports: - - 8080:8080 - - 8443:8443 - environment: - # - USER_ID=${USER_ID} - # - GROUP_ID=${GROUP_ID} - - CRYPTO_POLICY=unlimited - restart: always - logging: - driver: local - - # sudo docker run \ - # --name openhab \ - # --network=bco-net \ - # --publish 8080:8080 \ - # --publish 8443:8443 \ - # --volume /etc/localtime:/etc/localtime:ro \ - # --volume /etc/timezone:/etc/timezone:ro \ - # --volume openhab_conf:/openhab/conf \ - # --volume openhab_userdata:/openhab/userdata \ - # --volume openhab_addons:/openhab/addons \ - # --detach \ - # --env USER_ID=$(id -u openhab) \ - # --env GROUP_ID=$(getent group openhab | cut -d: -f3) \ - # --env CRYPTO_POLICY=unlimited \ - # --restart=always \ - # --log-driver=local \ - # $ZWAVE_STICK \ - # openhab/openhab:4.0.4 - - bco: - image: openbaseorg/bco:stable - networks: - - bco-net - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - bco_data:/home/bco/data - ports: - - 13781:13781 - # environment: - # - USER_ID=${BCO_USER_ID} - # - GROUP_ID=${BCO_GROUP_ID} - # - BCO_OPTIONS='--host mqtt-broker' - restart: always - logging: - driver: local - tty: true - - # sudo docker run \ - # --name bco \ - # --network=bco-net \ - # --publish 13781:13781 \ - # --volume /etc/localtime:/etc/localtime:ro \ - # --volume /etc/timezone:/etc/timezone:ro \ - # --volume bco_data:/home/bco/data \ - # --detach \ - # --env USER_ID=$(id -u bco) \ - # --env GROUP_ID=$(getent group bco | cut -d: -f3) \ - # --env BCO_OPTIONS='--host mqtt-broker' \ - # --restart=always \ - # --log-driver=local \ - # --tty \ - # openbaseorg/bco:stable - - - bco-device-manager-openhab: - image: openbaseorg/bco-device-manager-openhab:stable - networks: - - bco-net - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - bco_data:/home/bco/data - - openhab_conf:/etc/openhab2 - # environment: - # - USER_ID=${BCO_USER_ID} - # - GROUP_ID=${BCO_GROUP_ID} - # - OPENHAB_GROUP_ID=${OPENHAB_GROUP_ID} - # - BCO_OPTIONS='--host mqtt-broker --openhab-url http://openhab:8080' - restart: always - logging: - driver: local - tty: true - - # sudo docker run \ - # --name bco-device-manager-openhab \ - # --network=bco-net \ - # --volume /etc/localtime:/etc/localtime:ro \ - # --volume /etc/timezone:/etc/timezone:ro \ - # --volume bco_data:/home/bco/data \ - # --volume openhab_conf:/etc/openhab2 \ - # --detach \ - # --env USER_ID=$(id -u bco) \ - # --env GROUP_ID=$(getent group bco | cut -d: -f3) \ - # --env OPENHAB_GROUP_ID=$(getent group openhab | cut -d: -f3) \ - # --env BCO_OPTIONS='--host mqtt-broker --openhab-url http://openhab:8080' \ - # --restart=always \ - # --log-driver=local \ - # --tty \ - # openbaseorg/bco-device-manager-openhab:stable - - bco-webapp: - image: opaal/bco-ui-albiorix:latest - networks: - - bco-net - ports: - - 80:80 - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - restart: always - logging: - driver: local - - # sudo docker run \ - # --name bco-webapp \ - # --publish 80:80 \ - # --volume /etc/localtime:/etc/localtime:ro \ - # --volume /etc/timezone:/etc/timezone:ro \ - # --detach \ - # --restart=always \ - # --log-driver=local \ - # -tty \ - # opaal/bco-ui-albiorix:latest - - portainer: - image: portainer/portainer-ce - networks: - - bco-net - ports: - - 8000:8000 - - 9000:9000 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - portainer_data:/data - restart: always - logging: - driver: local - -# sudo docker volume create portainer_data -# sudo docker run \ -# --detach \ -# --publish 8000:8000 \ -# --publish 9000:9000 \ -# --name portainer \ -# --restart=always \ -# --log-driver=local \ -# --volume /var/run/docker.sock:/var/run/docker.sock \ -# --volume portainer_data:/data \ -# portainer/portainer-ce - - watchtower: - image: containrrr/watchtower:latest - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /etc/timezone:/etc/timezone:ro - environment: - - WATCHTOWER_CLEANUP=true - - WATCHTOWER_INCLUDE_STOPPED=true - - WATCHTOWER_TIMEOUT=60 - restart: always - logging: - driver: local - -# sudo docker run -d \ -# --name watchtower \ -# -v /var/run/docker.sock:/var/run/docker.sock \ -# -v /etc/timezone:/etc/timezone:ro \ -# --restart=always \ -# --log-driver=local \ -# --env WATCHTOWER_CLEANUP=true \ -# --env WATCHTOWER_INCLUDE_STOPPED=true \ -# --env WATCHTOWER_TIMEOUT=60 \ -# containrrr/watchtower:latest - - influxdb: - image: influxdb:latest - networks: - - bco-net - ports: - - 8086:8086 - volumes: - - influx_data:/var/lib/influxdb2 - - influx_config:/etc/influxdb2 - restart: always - logging: - driver: local - -networks: - bco-net: - driver: bridge - -volumes: - openhab_conf: - openhab_userdata: - openhab_addons: - bco_data: - influx_data: - influx_config: - portainer_data: \ No newline at end of file diff --git a/docker/docker-compose-demo.yaml b/docker/docker-compose-demo.yaml index 695d07db24..27f7dfc57d 100644 --- a/docker/docker-compose-demo.yaml +++ b/docker/docker-compose-demo.yaml @@ -1,6 +1,6 @@ networks: bco-net: - driver: bridge + name: bco-net services: mosquitto: diff --git a/docker/docker-compose-homecube.yml b/docker/docker-compose-homecube.yaml similarity index 99% rename from docker/docker-compose-homecube.yml rename to docker/docker-compose-homecube.yaml index 68a3aef7e3..aeda9ff5ad 100644 --- a/docker/docker-compose-homecube.yml +++ b/docker/docker-compose-homecube.yaml @@ -127,7 +127,7 @@ services: networks: bco-net: - driver: bridge + name: bco-net volumes: openhab_conf: diff --git a/docker/run_docker.sh b/docker/run_docker.sh deleted file mode 100755 index 819ec84199..0000000000 --- a/docker/run_docker.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -# echo -e "allow_anonymous true\nlistener 1883" > $HOME/.mosquitto.conf - -# Create users and groups -# sudo adduser --system --shell /usr/sbin/nologin openhab -# sudo addgroup --system openhab -# sudo usermod -a -G openhab openhab -# sudo usermod -a -G dialout openhab -# sudo usermod -a -G tty openhab -# sudo usermod -a -G openhab ${DEFAULT_USER} - -# sudo adduser --system --shell /usr/sbin/nologin bco -# sudo addgroup --system bco -# sudo usermod -a -G bco bco -# sudo usermod -a -G bco ${DEFAULT_USER} - -# Set environment variables -# export USER_ID=$(id -u openhab) -# export GROUP_ID=$(getent group openhab | cut -d: -f3) -# export BCO_USER_ID=$(id -u bco) -# export BCO_GROUP_ID=$(getent group bco | cut -d: -f3) - -export USER_ID=openhab -export GROUP_ID=1000 -export BCO_USER_ID=1100 -export BCO_GROUP_ID=1150 -export OPENHAB_GROUP_ID=1200 - -# Run docker-compose -docker-compose -f docker-compose-copilot.yml up #--detach \ No newline at end of file