From b2343304710ad9fc2c07ee9b4c0355426970356a Mon Sep 17 00:00:00 2001
From: Siarhei Siniak <siarheisiniak@gmail.com>
Date: Sat, 6 Jul 2024 18:19:27 +0300
Subject: [PATCH] [~] Refactor

---
 docker/tiktok/Dockerfile         |  1 +
 docker/tiktok/Makefile           |  8 ++------
 docker/tiktok/docker-compose.yml | 16 ++++++++++++++--
 python/tasks/tiktok/celery.py    |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/docker/tiktok/Dockerfile b/docker/tiktok/Dockerfile
index 6127a41..4b97fb5 100644
--- a/docker/tiktok/Dockerfile
+++ b/docker/tiktok/Dockerfile
@@ -9,6 +9,7 @@ RUN python3 -m playwright install-deps
 RUN python3 -m playwright install
 RUN pip3 install tqdm
 RUN apt-get install -yy ffmpeg
+RUN pip3 install celery redis
 
 WORKDIR /app
 
diff --git a/docker/tiktok/Makefile b/docker/tiktok/Makefile
index 240ccb8..d88754d 100644
--- a/docker/tiktok/Makefile
+++ b/docker/tiktok/Makefile
@@ -15,14 +15,10 @@ build:
 	$(MAKE) c ARGS="build --pull"
 
 celery-up:
-	cd ${PROJECT_ROOT} && \
-		sudo docker-compose \
-		-f docker/tiktok/docker-compose.yml up -d redis celery
+	$(MAKE) c ARGS="up -d redis celery"
 
 celery-stop:
-	cd ${PROJECT_ROOT} && \
-		sudo docker-compose \
-		-f docker/tiktok/docker-compose.yml stop
+	$(MAKE) c ARGS="stop redis celery"
 
 run:
 	cd ${PROJECT_ROOT} && \
diff --git a/docker/tiktok/docker-compose.yml b/docker/tiktok/docker-compose.yml
index 5bde734..5c88a3d 100644
--- a/docker/tiktok/docker-compose.yml
+++ b/docker/tiktok/docker-compose.yml
@@ -4,8 +4,8 @@ services:
     image: redis:latest
     volumes:
       - ../../tmp/cache/tiktok/redis/data:/data:rw
-  tiktok:
-    depends_on:
+  tiktok: &tiktok
+    links:
       - redis
     build:
       context: ../../
@@ -14,3 +14,15 @@ services:
       - ./../../docker/tiktok:/app/docker/tiktok:ro
       - ./../../tmp/cache/tiktok:/app/tmp/cache/tiktok:rw
       - ./../../python/tasks/tiktok:/app/python/tasks/tiktok:ro
+  celery:
+    build:
+      context: ../../
+      dockerfile: ./docker/tiktok/Dockerfile
+    depends_on:
+      - redis
+    volumes:
+      - ./../../docker/tiktok:/app/docker/tiktok:ro
+      - ./../../tmp/cache/tiktok:/app/tmp/cache/tiktok:rw
+      - ./../../python/tasks/tiktok:/app/python/tasks/tiktok:ro
+    command:
+      - celery -A python.tasks.tiktok.celery worker
diff --git a/python/tasks/tiktok/celery.py b/python/tasks/tiktok/celery.py
index 70a1d42..0cbcd0f 100644
--- a/python/tasks/tiktok/celery.py
+++ b/python/tasks/tiktok/celery.py
@@ -4,7 +4,7 @@ import celery
 
 c = tiktok_config()
 
-celery.Celery(
+app = celery.Celery(
     __name__,
     broker=c.celery_broker,
 )