kopia lustrzana https://github.com/mate-dev/mmrelaynode
mate
GitHub
commit
f381fe5538
|
|
@ -2,11 +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
|
||||
COPY --chown=mesh:mesh conf_wrapper.py /home/mesh/app/
|
||||
COPY --chown=mesh:mesh command_wrapper.py /home/mesh/app/
|
||||
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
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit c540eb2009bd6cd25d40eb6eb2eeb193586eec5f
|
||||
Subproject commit 58037831862c6a3fb1bb6e9db193f8317011263f
|
||||
|
|
@ -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
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
FROM frolvlad/alpine-glibc:glibc-2.34 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
|
||||
|
|
|
|||
|
|
@ -16,8 +16,7 @@ services:
|
|||
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"
|
||||
# You can add as many MESHTASTIC_COMMAND_X as you need, they will be executed in order with a 30 second delay between
|
||||
# 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
|
||||
|
|
@ -30,14 +29,14 @@ 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"
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
#!/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
|
||||
|
||||
# Function to display help message
|
||||
display_help() {
|
||||
echo "Usage: $0 [command] [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 " --help, -h - Display this help message"
|
||||
}
|
||||
|
||||
# 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
|
||||
display_help
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# 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 "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
|
||||
docker_compose "up -d --build" "$container_name" ;;
|
||||
2) read -p "Enter container name (or press Enter for default): " container_name
|
||||
docker_compose "up -d" "$container_name" ;;
|
||||
3) read -p "Enter container name (or press Enter for default): " container_name
|
||||
docker_compose "start" "$container_name" ;;
|
||||
4) read -p "Enter container name (or press Enter for default): " container_name
|
||||
docker_compose "down" "$container_name" ;;
|
||||
5) read -p "Enter container name (or press Enter for default): " container_name
|
||||
docker_compose "down -v" "$container_name" ;;
|
||||
6) read -p "Enter container name (or press Enter for default): " container_name
|
||||
docker_compose "stop" "$container_name" ;;
|
||||
7) read -p "Enter container name (or press Enter for default): " container_name
|
||||
docker_compose "restart" "$container_name" ;;
|
||||
8) read -p "Enter container name (or press Enter for default): " container_name
|
||||
docker_compose "logs --tail=100 -f" "$container_name" ;;
|
||||
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
|
||||
docker_compose "$1" "$2"
|
||||
fi
|
||||
|
||||
Ładowanie…
Reference in New Issue