mirror of
https://github.com/PaiGramTeam/telegram-bot-api-build.git
synced 2024-11-21 22:48:07 +00:00
Fix temp directory permissions, move logs path to environment variable
This commit is contained in:
parent
27c62e65dd
commit
6ca4fe98b5
8
.github/workflows/docker-image.yml
vendored
8
.github/workflows/docker-image.yml
vendored
@ -1,9 +1,9 @@
|
||||
name: Docker Image
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
on: []
|
||||
# push:
|
||||
# branches:
|
||||
# - master
|
||||
|
||||
jobs:
|
||||
multi:
|
||||
|
@ -13,8 +13,7 @@ RUN mkdir -p build \
|
||||
|
||||
FROM alpine:3.12
|
||||
|
||||
ENV TELEGRAM_LOGS_DIR="/var/log/telegram-bot-api" \
|
||||
TELEGRAM_WORK_DIR="/var/lib/telegram-bot-api" \
|
||||
ENV TELEGRAM_WORK_DIR="/var/lib/telegram-bot-api" \
|
||||
TELEGRAM_TEMP_DIR="/tmp/telegram-bot-api"
|
||||
|
||||
RUN apk add --no-cache --update openssl libstdc++
|
||||
@ -23,9 +22,8 @@ COPY docker-entrypoint.sh /docker-entrypoint.sh
|
||||
RUN addgroup -g 101 -S telegram-bot-api \
|
||||
&& adduser -S -D -H -u 101 -h ${TELEGRAM_WORK_DIR} -s /sbin/nologin -G telegram-bot-api -g telegram-bot-api telegram-bot-api \
|
||||
&& chmod +x /docker-entrypoint.sh \
|
||||
&& mkdir -p ${TELEGRAM_LOGS_DIR} ${TELEGRAM_WORK_DIR} ${TELEGRAM_TEMP_DIR} \
|
||||
&& chown telegram-bot-api:telegram-bot-api ${TELEGRAM_LOGS_DIR} ${TELEGRAM_WORK_DIR} \
|
||||
&& chown nobody:nobody /tmp/telegram-bot-api
|
||||
&& mkdir -p ${TELEGRAM_WORK_DIR} ${TELEGRAM_TEMP_DIR} \
|
||||
&& chown telegram-bot-api:telegram-bot-api ${TELEGRAM_WORK_DIR} ${TELEGRAM_TEMP_DIR}
|
||||
|
||||
EXPOSE 8081/tcp 8082/tcp
|
||||
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||
|
@ -41,7 +41,9 @@ default value of the maximum webhook connections per bot
|
||||
|
||||
log verbosity level
|
||||
|
||||
Logs will be stored to `/var/log/telegram-bot-server` directory inside container
|
||||
### `TELEGRAM_LOG_FILE`
|
||||
|
||||
Filename where logs will be redirected (By default logs will be written to stdout/stderr streams)
|
||||
|
||||
### `TELEGRAM_MAX_CONNECTIONS`
|
||||
|
||||
|
@ -1,20 +1,21 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
LOG_FILENAME="telegram-bot-api.log"
|
||||
|
||||
USERNAME=telegram-bot-api
|
||||
GROUPNAME=telegram-bot-api
|
||||
|
||||
chown ${USERNAME}:${GROUPNAME} "${TELEGRAM_LOGS_DIR}" "${TELEGRAM_WORK_DIR}"
|
||||
chown ${USERNAME}:${GROUPNAME} "${TELEGRAM_WORK_DIR}"
|
||||
|
||||
if [ -n "${1}" ]; then
|
||||
exec "${*}"
|
||||
fi
|
||||
|
||||
DEFAULT_ARGS="--http-port 8081 --dir=${TELEGRAM_WORK_DIR} --temp-dir=${TELEGRAM_TEMP_DIR} --log=${TELEGRAM_LOGS_DIR}/${LOG_FILENAME} --username=${USERNAME} --groupname=${GROUPNAME}"
|
||||
DEFAULT_ARGS="--http-port 8081 --dir=${TELEGRAM_WORK_DIR} --temp-dir=${TELEGRAM_TEMP_DIR} --username=${USERNAME} --groupname=${GROUPNAME}"
|
||||
CUSTOM_ARGS=""
|
||||
|
||||
if [ -n "$TELEGRAM_LOG_FILE" ]; then
|
||||
CUSTOM_ARGS="--log=${TELEGRAM_LOG_FILE}"
|
||||
fi
|
||||
if [ -n "$TELEGRAM_STAT" ]; then
|
||||
CUSTOM_ARGS="${CUSTOM_ARGS} --http-stat-port=8082"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user