From 54a07001ca41c34edbb9b368eb4be4e35052ef8e Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Sat, 2 Sep 2023 14:56:01 +0000
Subject: [PATCH 1/9] Create docker checker and installer

---
 app/Dockerfile |  1 +
 mmrelay.sh     | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 mmrelay.sh

diff --git a/app/Dockerfile b/app/Dockerfile
index c053552..a654ede 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -2,6 +2,7 @@ FROM python:3.11-slim-bookworm AS app
 LABEL "website"="https://github.com/mate-dev/mmrelaynode"
 RUN groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 -s /bin/bash mesh
 RUN pip install --upgrade pip -qq
+RUN ln -s /home/mesh/.local/bin/meshtastic /bin/meshtastic
 USER mesh
 COPY --chown=mesh:mesh meshtastic-matrix-relay /home/mesh/app
 WORKDIR /home/mesh/app
diff --git a/mmrelay.sh b/mmrelay.sh
new file mode 100644
index 0000000..629655d
--- /dev/null
+++ b/mmrelay.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+set -e
+
+#Check linux distro
+OS=$(uname -s | tr A-Z a-z)
+source /etc/os-release
+case $ID in
+    debian|ubuntu|mint)
+    RUN="apt-get"
+    ;;
+    fedora|rhel|centos)
+    RUN="yum"
+    ;;
+    *)
+    echo -n "unsupported linux distro"
+    ;;
+esac
+# Check and install docker and git
+if ! docker &> /dev/null; then
+    echo "Docker is not installed. Installing it via the script from docker.com"
+    echo "================================================================"
+    sudo $RUN update &> /dev/null && sudo $RUN install -y curl &> /dev/null && sudo $RUN install -y git &> /dev/null
+    sudo groupadd docker > /dev/null 2>&1 || true
+    sudo usermod -aG docker $USER
+    curl -fsSL https://get.docker.com -o get-docker.sh
+    chmod +x get-docker.sh
+    sh -c ./get-docker.sh
+    rm get-docker.sh
+fi
+
+# Sprawdzamy, czy docker działa poprzez listowanie kontenerów
+if ! docker ps | grep -q "CONTAINER"; then
+    echo "================================================================================"
+    echo "If you see this error, type 'newgrp docker' and check if 'docker ps' returns an error."
+    echo "Or log out and log in for the changes to take effect."
+    echo "After this re-enable the script."
+    exit 1
+fi
+
+# Pozostała część skryptu
+echo "jedziemy"
+#docker compose -f "docker-compose.yaml" up -d --build

From 76feeb7f2a9e8eea648a46402a59028201fafec3 Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Sun, 17 Sep 2023 08:36:58 +0000
Subject: [PATCH 2/9] add temp file

---
 Makefile   |  33 +++++++++++++++++
 mmrelay.sh | 105 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 128 insertions(+), 10 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..87b882c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,33 @@
+#sprawdź czy jest zainstalowany program docker i git jeśli nie zapytaj czy zainstalować ten którego nie ma
+# Zbuduj i uruchom konteneryxds
+
+.PHONY: help build up start down destroy stop restart logs logs-api ps login-timescale login-api db-shell
+help:
+        
+build:
+        docker compose -f docker-compose.yaml up -d --build #container-name #or empty for two
+up:
+        docker compose -f docker-compose.yml up -d #container-name #or empty for two
+start:
+        docker compose -f docker-compose.yml start #container-name #or empty for two
+down:
+        docker compose -f docker-compose.yml down #container-name #or empty for two
+destroy:
+        docker compose -f docker-compose.yml down -v #container-name #or empty for two
+stop:
+        docker compose -f docker-compose.yml stop #container-name #or empty for two
+restart:
+        docker compose -f docker-compose.yml stop #container-name #or empty for two
+        docker compose -f docker-compose.yml up -d #container-name #or empty for two
+logs:
+        docker compose -f docker-compose.yml logs --tail=100 -f #container-name #or empty for two
+logs-api:
+        docker compose -f docker-compose.yml logs --tail=100 -f api
+ps:
+        docker compose -f docker-compose.yml ps
+login-timescale:
+        docker compose -f docker-compose.yml exec timescale /bin/bash
+login-api:
+        docker-compose -f docker-compose.yml exec api /bin/bash
+db-shell:
+        docker-compose -f docker-compose.yml exec timescale psql -Upostgres
\ No newline at end of file
diff --git a/mmrelay.sh b/mmrelay.sh
index 629655d..015ea43 100644
--- a/mmrelay.sh
+++ b/mmrelay.sh
@@ -28,15 +28,100 @@ if ! docker &> /dev/null; then
     rm get-docker.sh
 fi
 
-# Sprawdzamy, czy docker działa poprzez listowanie kontenerów
-if ! docker ps | grep -q "CONTAINER"; then
-    echo "================================================================================"
-    echo "If you see this error, type 'newgrp docker' and check if 'docker ps' returns an error."
-    echo "Or log out and log in for the changes to take effect."
-    echo "After this re-enable the script."
-    exit 1
+# Function to display help message
+display_help() {
+    echo "Usage: $0 [command] (optional container_name)"
+    echo "Commands:"
+    echo "  build - Build containers (optional: specify container_name)"
+    echo "  up - Start containers (optional: specify container_name)"
+    echo "  start - Start containers (optional: specify container_name)"
+    echo "  down - Stop and remove containers (optional: specify container_name)"
+    echo "  destroy - Stop, remove containers, and remove volumes (optional: specify container_name)"
+    echo "  stop - Stop containers (optional: specify container_name)"
+    echo "  restart - Restart containers (optional: specify container_name)"
+    echo "  logs - Show container logs (optional: specify container_name)"
+    echo "  ps - List containers"
+    echo "  login-timescale - Log in to the TimescaleDB container"
+    echo "  login-api - Log in to the API container"
+    echo "  db-shell - Open a database shell in the TimescaleDB container"
+    echo "  menu - Enter to interactive menu"
+    echo "  --help, -h - Display this help message"
+}
+
+# ... (reszta funkcji pozostaje taka sama)
+
+# Check for the help flag
+if [[ "$1" == "--help" || "$1" == "-h" ]]; then
+    display_help
+    exit 0
 fi
 
-# Pozostała część skryptu
-echo "jedziemy"
-#docker compose -f "docker-compose.yaml" up -d --build
+# Check if "menu" is in the script name, and if so, display the menu
+if [[ $0 == *"menu"* ]]; then
+    while true; do
+        clear
+        echo "Bash Menu:"
+        echo "1. Build [container_name]"
+        echo "2. Up [container_name]"
+        echo "3. Start [container_name]"
+        echo "4. Down [container_name]"
+        echo "5. Destroy [container_name]"
+        echo "6. Stop [container_name]"
+        echo "7. Restart [container_name]"
+        echo "8. Logs [container_name]"
+        echo "9. PS"
+        echo "10. Login to TimescaleDB Container"
+        echo "11. Login to API Container"
+        echo "12. Database Shell (TimescaleDB)"
+        echo "0. Exit"
+        echo "--help, -h - Display this help message"
+
+        read -p "Enter your choice: " choice
+
+        case "$choice" in
+            1) read -p "Enter container name (or press Enter for default): " container_name
+               build "$container_name" ;;
+            2) read -p "Enter container name (or press Enter for default): " container_name
+               up "$container_name" ;;
+            3) read -p "Enter container name (or press Enter for default): " container_name
+               start "$container_name" ;;
+            4) read -p "Enter container name (or press Enter for default): " container_name
+               down "$container_name" ;;
+            5) read -p "Enter container name (or press Enter for default): " container_name
+               destroy "$container_name" ;;
+            6) read -p "Enter container name (or press Enter for default): " container_name
+               stop "$container_name" ;;
+            7) read -p "Enter container name (or press Enter for default): " container_name
+               restart "$container_name" ;;
+            8) read -p "Enter container name (or press Enter for default): " container_name
+               logs "$container_name" ;;
+            9) ps ;;
+            10) login-timescale ;;
+            11) login-api ;;
+            12) db-shell ;;
+            0) exit ;;
+            "--help" | "-h") display_help ;;
+            *) echo "Invalid choice. Please try again." ;;
+        esac
+
+        read -p "Press Enter to continue..."
+    done
+else
+    # If "menu" is not in the script name, execute the specified command
+    case "$1" in
+        "build") build "$2" ;;
+        "up") up "$2" ;;
+        "start") start "$2" ;;
+        "down") down "$2" ;;
+        "destroy") destroy "$2" ;;
+        "stop") stop "$2" ;;
+        "restart") restart "$2" ;;
+        "logs") logs "$2" ;;
+        "ps") ps ;;
+        "login-timescale") login-timescale ;;
+        "login-api") login-api ;;
+        "db-shell") db-shell ;;
+        "--help" | "-h") display_help ;;
+        *) echo "Invalid command. Use --help or -h for available commands." ;;
+    esac
+fi

From 6eb38e5f2b39eeaaf93c5013446a306359184cf4 Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Sun, 17 Sep 2023 09:32:00 +0000
Subject: [PATCH 3/9] Remove Makefile

---
 Makefile   | 33 ---------------------------------
 mmrelay.sh | 17 -----------------
 2 files changed, 50 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 87b882c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#sprawdź czy jest zainstalowany program docker i git jeśli nie zapytaj czy zainstalować ten którego nie ma
-# Zbuduj i uruchom konteneryxds
-
-.PHONY: help build up start down destroy stop restart logs logs-api ps login-timescale login-api db-shell
-help:
-        
-build:
-        docker compose -f docker-compose.yaml up -d --build #container-name #or empty for two
-up:
-        docker compose -f docker-compose.yml up -d #container-name #or empty for two
-start:
-        docker compose -f docker-compose.yml start #container-name #or empty for two
-down:
-        docker compose -f docker-compose.yml down #container-name #or empty for two
-destroy:
-        docker compose -f docker-compose.yml down -v #container-name #or empty for two
-stop:
-        docker compose -f docker-compose.yml stop #container-name #or empty for two
-restart:
-        docker compose -f docker-compose.yml stop #container-name #or empty for two
-        docker compose -f docker-compose.yml up -d #container-name #or empty for two
-logs:
-        docker compose -f docker-compose.yml logs --tail=100 -f #container-name #or empty for two
-logs-api:
-        docker compose -f docker-compose.yml logs --tail=100 -f api
-ps:
-        docker compose -f docker-compose.yml ps
-login-timescale:
-        docker compose -f docker-compose.yml exec timescale /bin/bash
-login-api:
-        docker-compose -f docker-compose.yml exec api /bin/bash
-db-shell:
-        docker-compose -f docker-compose.yml exec timescale psql -Upostgres
\ No newline at end of file
diff --git a/mmrelay.sh b/mmrelay.sh
index 015ea43..33f3f62 100644
--- a/mmrelay.sh
+++ b/mmrelay.sh
@@ -40,11 +40,6 @@ display_help() {
     echo "  stop - Stop containers (optional: specify container_name)"
     echo "  restart - Restart containers (optional: specify container_name)"
     echo "  logs - Show container logs (optional: specify container_name)"
-    echo "  ps - List containers"
-    echo "  login-timescale - Log in to the TimescaleDB container"
-    echo "  login-api - Log in to the API container"
-    echo "  db-shell - Open a database shell in the TimescaleDB container"
-    echo "  menu - Enter to interactive menu"
     echo "  --help, -h - Display this help message"
 }
 
@@ -69,10 +64,6 @@ if [[ $0 == *"menu"* ]]; then
         echo "6. Stop [container_name]"
         echo "7. Restart [container_name]"
         echo "8. Logs [container_name]"
-        echo "9. PS"
-        echo "10. Login to TimescaleDB Container"
-        echo "11. Login to API Container"
-        echo "12. Database Shell (TimescaleDB)"
         echo "0. Exit"
         echo "--help, -h - Display this help message"
 
@@ -95,10 +86,6 @@ if [[ $0 == *"menu"* ]]; then
                restart "$container_name" ;;
             8) read -p "Enter container name (or press Enter for default): " container_name
                logs "$container_name" ;;
-            9) ps ;;
-            10) login-timescale ;;
-            11) login-api ;;
-            12) db-shell ;;
             0) exit ;;
             "--help" | "-h") display_help ;;
             *) echo "Invalid choice. Please try again." ;;
@@ -117,10 +104,6 @@ else
         "stop") stop "$2" ;;
         "restart") restart "$2" ;;
         "logs") logs "$2" ;;
-        "ps") ps ;;
-        "login-timescale") login-timescale ;;
-        "login-api") login-api ;;
-        "db-shell") db-shell ;;
         "--help" | "-h") display_help ;;
         *) echo "Invalid command. Use --help or -h for available commands." ;;
     esac

From e4fae72008969c63ded6c2b3ef80adb7f5e8fb12 Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Sun, 17 Sep 2023 11:13:54 +0000
Subject: [PATCH 4/9] Update

---
 docker-compose.yaml |  8 ++++----
 mmrelay.sh          | 49 ++++++++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 27 deletions(-)
 mode change 100644 => 100755 mmrelay.sh

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 58b144a..708d660 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   mmrelaynode:
-    build: node
+    build: device
     image: mmrelaynode:latest
     container_name: mmrelaynode-device
     restart: unless-stopped
@@ -14,9 +14,9 @@ services:
       - mesh
     entrypoint: ["sh", "-c", "meshtasticd"]
     environment:
-      MESHTASTIC_COMMAND_1: "--set-owner 'LongName' --set-owner-short 'SHRT' --set-url https://meshtastic.org/e/#CgMSAQESDAgBOAFAA0gBUB5oAQ" 
-      MESHTASTIC_COMMAND_2: "--set mqtt.enabled true --set mqtt.address mqtt.meshtastic.org --set mqtt.username meshdev --set mqtt.password large4cats"
-      MESHTASTIC_COMMAND_3: "--ch-set uplink_enabled true --ch-set downlink_enabled true --ch-index 3"
+      #   MESHTASTIC_COMMAND_1: "--set-owner 'LongName' --set-owner-short 'SHRT' --set-url https://meshtastic.org/e/#CgMSAQESDAgBOAFAA0gBUB5oAQ" 
+        #     MESHTASTIC_COMMAND_2: "--set mqtt.enabled true --set mqtt.address mqtt.meshtastic.org --set mqtt.username meshdev --set mqtt.password large4cats"
+      MESHTASTIC_COMMAND_1: "--config config.yaml"
       # You can add as many MESHTASTIC_COMMAND_X as you need, they will be executed in order with a 30 second delay between
 
   mmrelayapp:
diff --git a/mmrelay.sh b/mmrelay.sh
old mode 100644
new mode 100755
index 33f3f62..578b428
--- a/mmrelay.sh
+++ b/mmrelay.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-#Check linux distro
+# Check linux distro
 OS=$(uname -s | tr A-Z a-z)
 source /etc/os-release
 case $ID in
@@ -15,6 +15,7 @@ case $ID in
     echo -n "unsupported linux distro"
     ;;
 esac
+
 # Check and install docker and git
 if ! docker &> /dev/null; then
     echo "Docker is not installed. Installing it via the script from docker.com"
@@ -30,7 +31,7 @@ fi
 
 # Function to display help message
 display_help() {
-    echo "Usage: $0 [command] (optional container_name)"
+    echo "Usage: $0 [command] [container_name]"
     echo "Commands:"
     echo "  build - Build containers (optional: specify container_name)"
     echo "  up - Start containers (optional: specify container_name)"
@@ -43,7 +44,19 @@ display_help() {
     echo "  --help, -h - Display this help message"
 }
 
-# ... (reszta funkcji pozostaje taka sama)
+# Function to execute Docker Compose commands
+docker_compose() {
+    local command="$1"
+    local container_name="$2"
+    
+    # If container_name is empty and the command is not "logs", set it to an empty string
+    if [ -z "$container_name" ] && [ "$command" != "logs" ]; then
+        container_name=""
+    fi
+    
+    echo "$command container(s): $container_name"
+    docker compose -f docker-compose.yaml $command $container_name
+}
 
 # Check for the help flag
 if [[ "$1" == "--help" || "$1" == "-h" ]]; then
@@ -71,21 +84,21 @@ if [[ $0 == *"menu"* ]]; then
 
         case "$choice" in
             1) read -p "Enter container name (or press Enter for default): " container_name
-               build "$container_name" ;;
+               docker_compose "up -d --build" "$container_name" ;;
             2) read -p "Enter container name (or press Enter for default): " container_name
-               up "$container_name" ;;
+               docker_compose "up -d" "$container_name" ;;
             3) read -p "Enter container name (or press Enter for default): " container_name
-               start "$container_name" ;;
+               docker_compose "start" "$container_name" ;;
             4) read -p "Enter container name (or press Enter for default): " container_name
-               down "$container_name" ;;
+               docker_compose "down" "$container_name" ;;
             5) read -p "Enter container name (or press Enter for default): " container_name
-               destroy "$container_name" ;;
+               docker_compose "down -v" "$container_name" ;;
             6) read -p "Enter container name (or press Enter for default): " container_name
-               stop "$container_name" ;;
+               docker_compose "stop" "$container_name" ;;
             7) read -p "Enter container name (or press Enter for default): " container_name
-               restart "$container_name" ;;
+               docker_compose "restart" "$container_name" ;;
             8) read -p "Enter container name (or press Enter for default): " container_name
-               logs "$container_name" ;;
+               docker_compose "logs --tail=100 -f" "$container_name" ;;
             0) exit ;;
             "--help" | "-h") display_help ;;
             *) echo "Invalid choice. Please try again." ;;
@@ -95,16 +108,6 @@ if [[ $0 == *"menu"* ]]; then
     done
 else
     # If "menu" is not in the script name, execute the specified command
-    case "$1" in
-        "build") build "$2" ;;
-        "up") up "$2" ;;
-        "start") start "$2" ;;
-        "down") down "$2" ;;
-        "destroy") destroy "$2" ;;
-        "stop") stop "$2" ;;
-        "restart") restart "$2" ;;
-        "logs") logs "$2" ;;
-        "--help" | "-h") display_help ;;
-        *) echo "Invalid command. Use --help or -h for available commands." ;;
-    esac
+    docker_compose "$1" "$2"
 fi
+

From ba54e98e8a306133413c7e97f2558e297837dd5f Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Sun, 17 Sep 2023 11:20:57 +0000
Subject: [PATCH 5/9] Update version alpine-glibc

---
 device/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device/Dockerfile b/device/Dockerfile
index 10d1802..cd63648 100644
--- a/device/Dockerfile
+++ b/device/Dockerfile
@@ -1,4 +1,4 @@
-FROM frolvlad/alpine-glibc:glibc-2.34 AS node
+FROM frolvlad/alpine-glibc AS node
 LABEL "website"="https://github.com/mate-dev/mmrelaynode"
 RUN apk --update add --no-cache g++ shadow
 WORKDIR /bin

From 76d4f1db56184a76cd6cc225efd51e778f263b53 Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Mon, 25 Sep 2023 20:47:45 +0000
Subject: [PATCH 6/9] Change device docker base image to debian:bookworm-slim

---
 app/Dockerfile              |   1 +
 app/meshtastic-matrix-relay |   2 +-
 app/wait-for-it.sh          | 182 ++++++++++++++++++++++++++++++++++++
 device/Dockerfile           |   4 +-
 4 files changed, 186 insertions(+), 3 deletions(-)
 create mode 100644 app/wait-for-it.sh

diff --git a/app/Dockerfile b/app/Dockerfile
index 10459ae..0ef07cc 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -7,6 +7,7 @@ RUN chmod +x /usr/local/bin/wait-for-it.sh
 RUN ln -s /home/mesh/.local/bin/meshtastic /bin/meshtastic
 USER mesh
 COPY --chown=mesh:mesh meshtastic-matrix-relay /home/mesh/app
+COPY --chown=mesh:mesh --chmod=744 wait-for-it.sh /home/mesh/.local/bin/wait-for-it.sh
 WORKDIR /home/mesh/app
 RUN pip install -qq -r /home/mesh/app/requirements.txt --no-cache-dir
 RUN echo "export PATH=/home/mesh/.local/bin:\$PATH" >> /home/mesh/.bashrc
\ No newline at end of file
diff --git a/app/meshtastic-matrix-relay b/app/meshtastic-matrix-relay
index c540eb2..5803783 160000
--- a/app/meshtastic-matrix-relay
+++ b/app/meshtastic-matrix-relay
@@ -1 +1 @@
-Subproject commit c540eb2009bd6cd25d40eb6eb2eeb193586eec5f
+Subproject commit 58037831862c6a3fb1bb6e9db193f8317011263f
diff --git a/app/wait-for-it.sh b/app/wait-for-it.sh
new file mode 100644
index 0000000..d990e0d
--- /dev/null
+++ b/app/wait-for-it.sh
@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+# Use this script to test if a given TCP host/port are available
+
+WAITFORIT_cmdname=${0##*/}
+
+echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+
+wait_for()
+{
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    else
+        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
+    fi
+    WAITFORIT_start_ts=$(date +%s)
+    while :
+    do
+        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
+            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
+            WAITFORIT_result=$?
+        else
+            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
+            WAITFORIT_result=$?
+        fi
+        if [[ $WAITFORIT_result -eq 0 ]]; then
+            WAITFORIT_end_ts=$(date +%s)
+            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $WAITFORIT_result
+}
+
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    else
+        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
+    fi
+    WAITFORIT_PID=$!
+    trap "kill -INT -$WAITFORIT_PID" INT
+    wait $WAITFORIT_PID
+    WAITFORIT_RESULT=$?
+    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
+        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
+    fi
+    return $WAITFORIT_RESULT
+}
+
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        WAITFORIT_hostport=(${1//:/ })
+        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
+        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
+        shift 1
+        ;;
+        --child)
+        WAITFORIT_CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        WAITFORIT_QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        WAITFORIT_STRICT=1
+        shift 1
+        ;;
+        -h)
+        WAITFORIT_HOST="$2"
+        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        WAITFORIT_HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        WAITFORIT_PORT="$2"
+        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        WAITFORIT_PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        WAITFORIT_TIMEOUT="$2"
+        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        WAITFORIT_TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        WAITFORIT_CLI=("$@")
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+
+if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+
+WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
+WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
+WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
+WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
+
+# Check to see if timeout is from busybox?
+WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
+WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
+
+WAITFORIT_BUSYTIMEFLAG=""
+if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
+    WAITFORIT_ISBUSY=1
+    # Check if busybox timeout uses -t flag
+    # (recent Alpine versions don't support -t anymore)
+    if timeout &>/dev/stdout | grep -q -e '-t '; then
+        WAITFORIT_BUSYTIMEFLAG="-t"
+    fi
+else
+    WAITFORIT_ISBUSY=0
+fi
+
+if [[ $WAITFORIT_CHILD -gt 0 ]]; then
+    wait_for
+    WAITFORIT_RESULT=$?
+    exit $WAITFORIT_RESULT
+else
+    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        WAITFORIT_RESULT=$?
+    else
+        wait_for
+        WAITFORIT_RESULT=$?
+    fi
+fi
+
+if [[ $WAITFORIT_CLI != "" ]]; then
+    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
+        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
+        exit $WAITFORIT_RESULT
+    fi
+    exec "${WAITFORIT_CLI[@]}"
+else
+    exit $WAITFORIT_RESULT
+fi
diff --git a/device/Dockerfile b/device/Dockerfile
index cd63648..4d35fd0 100644
--- a/device/Dockerfile
+++ b/device/Dockerfile
@@ -1,6 +1,6 @@
-FROM frolvlad/alpine-glibc AS node
+FROM debian:bookworm-slim AS device
 LABEL "website"="https://github.com/mate-dev/mmrelaynode"
-RUN apk --update add --no-cache g++ shadow
+RUN apt-get update && apt-get install g++ -y
 WORKDIR /bin
 ADD https://github.com/mate-dev/mmrelaynode/releases/latest/download/meshtasticd_linux_amd64 /bin/meshtasticd
 RUN chmod +x meshtasticd 

From ec4382101e356b29beb78a188a45c5e49dcb89e7 Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Mon, 25 Sep 2023 21:09:43 +0000
Subject: [PATCH 7/9] Add file copying to dockerfile

---
 app/Dockerfile      | 4 ++--
 docker-compose.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index 0ef07cc..c5d1432 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -2,12 +2,12 @@ FROM python:3.11-slim-bookworm AS app
 LABEL "website"="https://github.com/mate-dev/mmrelaynode"
 RUN groupadd -g 1000 mesh && useradd -ml -u 1000 -g 1000 -s /bin/bash mesh
 RUN pip install --upgrade pip -qq
-ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /usr/local/bin/wait-for-it.sh
-RUN chmod +x /usr/local/bin/wait-for-it.sh
 RUN ln -s /home/mesh/.local/bin/meshtastic /bin/meshtastic
 USER mesh
 COPY --chown=mesh:mesh meshtastic-matrix-relay /home/mesh/app
 COPY --chown=mesh:mesh --chmod=744 wait-for-it.sh /home/mesh/.local/bin/wait-for-it.sh
 WORKDIR /home/mesh/app
+COPY conf_wrapper.py .
+COPY command_wrapper.py .
 RUN pip install -qq -r /home/mesh/app/requirements.txt --no-cache-dir
 RUN echo "export PATH=/home/mesh/.local/bin:\$PATH" >> /home/mesh/.bashrc
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 708d660..329424a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -30,7 +30,7 @@ services:
       - mesh:/home/mesh
     networks:
       - mesh
-    entrypoint: [ "sh", "-c", "wait-for-it.sh mmrelaynode:4403 -t 60 && python3 command_wrapper.py && python3 conf_wrapper.py && python3 main.py" ]
+    entrypoint: [ "sh", "-c", "/home/mesh/.local/bin/wait-for-it.sh mmrelaynode:4403 -t 60 && python3 command_wrapper.py && python3 conf_wrapper.py && python3 main.py" ]
     environment:
       MATRIX_HOMESERVER: "https://example.matrix.org"
       MATRIX_ACCESS_TOKEN: "your_access_token"

From 6113f76ff210b12eb09697d561cc89f6837b4177 Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Mon, 25 Sep 2023 21:17:30 +0000
Subject: [PATCH 8/9] Edit file copying in dockerfile

---
 app/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Dockerfile b/app/Dockerfile
index c5d1432..ddc08fd 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -6,8 +6,8 @@ RUN ln -s /home/mesh/.local/bin/meshtastic /bin/meshtastic
 USER mesh
 COPY --chown=mesh:mesh meshtastic-matrix-relay /home/mesh/app
 COPY --chown=mesh:mesh --chmod=744 wait-for-it.sh /home/mesh/.local/bin/wait-for-it.sh
+COPY --chown=mesh:mesh conf_wrapper.py /home/mesh/app/
+COPY --chown=mesh:mesh command_wrapper.py /home/mesh/app/
 WORKDIR /home/mesh/app
-COPY conf_wrapper.py .
-COPY command_wrapper.py .
 RUN pip install -qq -r /home/mesh/app/requirements.txt --no-cache-dir
 RUN echo "export PATH=/home/mesh/.local/bin:\$PATH" >> /home/mesh/.bashrc
\ No newline at end of file

From 2e846448621db75a128d39a6934c7a1705af9de3 Mon Sep 17 00:00:00 2001
From: mate-dev <mmaati@interia.pl>
Date: Mon, 25 Sep 2023 21:21:49 +0000
Subject: [PATCH 9/9] Edit docker-file setup

---
 docker-compose.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 329424a..338102b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -14,10 +14,9 @@ services:
       - mesh
     entrypoint: ["sh", "-c", "meshtasticd"]
     environment:
-      #   MESHTASTIC_COMMAND_1: "--set-owner 'LongName' --set-owner-short 'SHRT' --set-url https://meshtastic.org/e/#CgMSAQESDAgBOAFAA0gBUB5oAQ" 
-        #     MESHTASTIC_COMMAND_2: "--set mqtt.enabled true --set mqtt.address mqtt.meshtastic.org --set mqtt.username meshdev --set mqtt.password large4cats"
-      MESHTASTIC_COMMAND_1: "--config config.yaml"
-      # You can add as many MESHTASTIC_COMMAND_X as you need, they will be executed in order with a 30 second delay between
+      MESHTASTIC_COMMAND_1: "--set-owner 'LongName' --set-owner-short 'SHRT' --set-url https://meshtastic.org/e/#CgMSAQESDAgBOAFAA0gBUB5oAQ" 
+      MESHTASTIC_COMMAND_2: "--set mqtt.enabled true --set mqtt.address mqtt.meshtastic.org --set mqtt.username meshdev --set mqtt.password large4cats"
+      # You can add as many MESHTASTIC_COMMAND_X as you need, they will be executed in order with a 30 second delay between or add all your setup in one command.
 
   mmrelayapp:
     build: app
@@ -35,9 +34,9 @@ services:
       MATRIX_HOMESERVER: "https://example.matrix.org"
       MATRIX_ACCESS_TOKEN: "your_access_token"
       MATRIX_BOT_USER_ID: "@botuser:example.matrix.org"
-      MESHTASTIC_CONNECTION_TYPE: "serial" # "serial" or "network"
+      MESHTASTIC_CONNECTION_TYPE: "network" # "serial" or "network"
       MESHTASTIC_SERIAL_PORT: "/dev/ttyUSB0"
-      MESHTASTIC_HOST: "meshtastic.local"
+      MESHTASTIC_HOST: "mmrelaynode"
       MESHTASTIC_MESHNET_NAME: "Your Meshnet Name"
       MESHTASTIC_BROADCAST_ENABLED: "true"
       LOGGING_LEVEL: "info"