From e19317eb4470257fb41d5a3542ec3297a5899096 Mon Sep 17 00:00:00 2001 From: kiki-kanri Date: Mon, 5 Aug 2024 20:41:28 +0800 Subject: [PATCH 1/2] feat: handling of http-port env values added to entry points --- docker-entrypoint.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index dd90962..a29efba 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -10,7 +10,7 @@ if [ -n "${1}" ]; then exec "${*}" fi -DEFAULT_ARGS="--http-port 8081 --dir=${TELEGRAM_WORK_DIR} --temp-dir=${TELEGRAM_TEMP_DIR} --username=${USERNAME} --groupname=${GROUPNAME}" +DEFAULT_ARGS="--dir=${TELEGRAM_WORK_DIR} --temp-dir=${TELEGRAM_TEMP_DIR} --username=${USERNAME} --groupname=${GROUPNAME}" CUSTOM_ARGS="" if [ -n "$TELEGRAM_LOG_FILE" ]; then @@ -41,6 +41,13 @@ if [ -n "$TELEGRAM_HTTP_IP_ADDRESS" ]; then CUSTOM_ARGS="${CUSTOM_ARGS} --http-ip-address=$TELEGRAM_HTTP_IP_ADDRESS" fi +# Set http-port arg +if [ -n "$TELEGRAM_HTTP_PORT" ]; then + CUSTOM_ARGS="${CUSTOM_ARGS} --http-port=$TELEGRAM_HTTP_PORT" +else + CUSTOM_ARGS="${CUSTOM_ARGS} --http-port=8081" +fi + COMMAND="telegram-bot-api ${DEFAULT_ARGS}${CUSTOM_ARGS}" echo "$COMMAND" From bf59a48392f5eb7170895ca026cf0d02b21a4d10 Mon Sep 17 00:00:00 2001 From: kiki-kanri Date: Mon, 5 Aug 2024 20:43:56 +0800 Subject: [PATCH 2/2] docs: add `TELEGRAM_HTTP_PORT` env description to readme --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4bbdc5a..6a19fad 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,10 @@ Enable statistics HTTP endpoint. Usage: `-e TELEGRAM_STAT=1 -p 8082:8082` and then check that `curl http://:8082` returns server statistic - ### `TELEGRAM_FILTER` "/". Allow only bots with 'bot_user_id % modulo == remainder' - ### `TELEGRAM_MAX_WEBHOOK_CONNECTIONS` default value of the maximum webhook connections per bot @@ -61,6 +59,12 @@ allow the Bot API server to serve local requests Use the `TELEGRAM_HTTP_IP_ADDRESS: "[::]"` parameter to listen on the ipv6 intranet +### `TELEGRAM_HTTP_PORT` + +Set which port the api server should listen to if you want to run the image in network mode as host and want to change the port. + +If not set then the api server will listen to port 8081. + ## Start with persistent storage Server working directory is `/var/lib/telegram-bot-api` so if you want to persist the server data you can mount this folder as volume: