From 964e55fa0f322dc53ec1aebec28702f7bb1bfeb0 Mon Sep 17 00:00:00 2001
From: lavadk <a@a.a>
Date: Tue, 13 Apr 2021 19:51:36 +0300
Subject: [PATCH] make commands, logs improvements, tengine update

---
 Dockerfile          | 13 +++++++++++++
 Makefile            | 44 ++++++++++++++++++++++++++++++++++++++++++++
 liker/setup/logs.py |  4 ++++
 tengine             |  2 +-
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 Dockerfile
 create mode 100644 Makefile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..66f6c8b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:3.9.2-buster
+
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt
+
+COPY --chown=$UID liker /app/liker
+COPY --chown=$UID tengine /app/tengine
+
+WORKDIR /app
+ENV PYTHONPATH=/app
+
+CMD ["python", "liker/run.py"]
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9ebd794
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,44 @@
+MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
+CURRENT_DIR := $(notdir $(patsubst %/,%,$(dir $(MKFILE_PATH))))
+
+DOCKER_IMAGE := ${CURRENT_DIR}
+DOCKER_CONTAINER := ${CURRENT_DIR}
+
+ADDITIONAL_OPTIONS := ""
+DOCKER_RUN_CMD = \
+	if [ $$(docker ps -q -f name=${DOCKER_CONTAINER}) ]; then \
+                docker kill --signal SIGINT ${DOCKER_CONTAINER}; \
+	fi; \
+        if [ $$(docker ps --all -q -f name=${DOCKER_CONTAINER}) ]; then \
+                docker rm -f ${DOCKER_CONTAINER}; \
+        fi; \
+	docker run \
+		--init \
+		--name ${DOCKER_CONTAINER} \
+		-v ${PWD}/data:/app/data \
+		--user $$(id -u):$$(id -g) \
+		$${ADDITIONAL_OPTIONS} \
+		${DOCKER_IMAGE}
+
+
+
+.PHONY: list
+vars:
+	echo Docker image: ${DOCKER_IMAGE}
+
+build:
+	docker build . -t ${DOCKER_IMAGE}
+
+run-it:
+	export ADDITIONAL_OPTIONS="-it --rm"; \
+	${DOCKER_RUN_CMD}
+
+run-daemon:
+	export ADDITIONAL_OPTIONS="-d --restart=always"; \
+        ${DOCKER_RUN_CMD}
+
+stop:
+	if [ $$(docker ps -q -f name=${DOCKER_CONTAINER}) ]; then \
+                docker kill --signal SIGINT ${DOCKER_CONTAINER}; \
+        fi
+
diff --git a/liker/setup/logs.py b/liker/setup/logs.py
index b6368ee..7f04d88 100644
--- a/liker/setup/logs.py
+++ b/liker/setup/logs.py
@@ -54,6 +54,10 @@ def setup_logs():
                 'level': 'DEBUG',
                 'propagate': True,
             },
+            # Mute mtprotosender logs
+            'telethon': {
+                'propagate': False,
+            },
         },
     }
 
diff --git a/tengine b/tengine
index 82f3847..c7451a6 160000
--- a/tengine
+++ b/tengine
@@ -1 +1 @@
-Subproject commit 82f38471d7919c831c9fc7dca6c8b075563f6dc8
+Subproject commit c7451a65c80d91e3ecd7122d6afc8cd727b74f71