.gitignore

@@ -3,6 +3,5 @@ __pycache__/
 venv/
 .venv/
 logs/
-data/
 *.env
 *.db

Dockerfile

@@ -19,21 +19,20 @@ RUN --mount=type=cache,target=/root/.cache/pip \
     --mount=type=bind,source=requirements.txt,target=requirements.txt \
     pip install -r requirements.txt
 
-# copy sources
+# copy i18n files
-COPY --chown=bot --chmod=774 docker-entrypoint.sh /app/
+COPY --chown=bot i18n.yaml /i18n/i18n.yaml
-COPY --chown=bot migrations /app/migrations
-COPY --chown=bot mybot /app/mybot
-COPY --chown=bot i18n.yaml /app/
 
-# prepare environment
+# copy default configs
-ENV I18N_PATH=/data/i18n.yaml
-ENV DB_URL=sqlite:////data/bot.db
-
-RUN mkdir -p /data
-RUN chown bot:bot /data
-VOLUME /data
-
-USER bot
 WORKDIR /app
+COPY --chown=bot mybot mybot
 
-ENTRYPOINT ["./docker-entrypoint.sh"]
+# preapre environment
+ENV SS_TYPE=memory
+ENV I18N_PATH=/i18n/i18n.yaml
+
+# set user
+USER bot
+
+CMD ["python3", "-m", "mybot"]
+
+VOLUME i18n/

docker-entrypoint.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ ! -f ${I18N_PATH} ]; then
-    cp i18n.yaml ${I18N_PATH}
-fi
-
-alembic -c migrations/alembic.ini upgrade head
-
-if [ $# -eq 0 ]; then
-  if [ -z "${USE_WEBHOOK}" ]; then
-    exec python3 -m mybot
-  else
-    exec gunicorn -b 0.0.0.0:8080 "mybot:main()"
-  fi
-else
-  exec $1
-fi

mybot/__init__.py

@@ -23,8 +23,8 @@ def create_bot(config: Config, i18n: I18N, engine):
     register_handlers(bot)
     setup_middlewares(bot, i18n, engine)
     add_custom_filters(bot, config)
-    bot.delete_webhook()
     if config.use_webhook:
+        bot.delete_webhook()
         bot.set_webhook(config.webhook.url,
                         drop_pending_updates=config.webhook.drop_pending_updates,
                         max_connections=config.webhook.max_connections)