diff --git a/docker/tiktok/Makefile b/docker/tiktok/Makefile index 2ddeb8a..240ccb8 100644 --- a/docker/tiktok/Makefile +++ b/docker/tiktok/Makefile @@ -1,8 +1,29 @@ -PROJECT_ROOT := ${PWD} +PROJECT_ROOT ?= ${PWD} + +export PROJECT_ROOT PORT ?= 8888 TOKEN ?= $(shell pwgen -n 20 1) +c: + cd ${PROJECT_ROOT} && \ + sudo docker-compose \ + -f docker/tiktok/docker-compose.yml $(ARGS) + +build: + $(MAKE) c ARGS="pull" + $(MAKE) c ARGS="build --pull" + +celery-up: + cd ${PROJECT_ROOT} && \ + sudo docker-compose \ + -f docker/tiktok/docker-compose.yml up -d redis celery + +celery-stop: + cd ${PROJECT_ROOT} && \ + sudo docker-compose \ + -f docker/tiktok/docker-compose.yml stop + run: cd ${PROJECT_ROOT} && \ sudo docker-compose \ diff --git a/docker/tiktok/docker-compose.yml b/docker/tiktok/docker-compose.yml index d9f2cd7..5bde734 100644 --- a/docker/tiktok/docker-compose.yml +++ b/docker/tiktok/docker-compose.yml @@ -1,6 +1,12 @@ version: '3.7' services: + redis: + image: redis:latest + volumes: + - ../../tmp/cache/tiktok/redis/data:/data:rw tiktok: + depends_on: + - redis build: context: ../../ dockerfile: ./docker/tiktok/Dockerfile diff --git a/python/tasks/tiktok/__init__.py b/python/tasks/tiktok/__init__.py index 914dec8..d2a1637 100644 --- a/python/tasks/tiktok/__init__.py +++ b/python/tasks/tiktok/__init__.py @@ -25,6 +25,7 @@ class tiktok_config_t: cache: str='' videos: str='' audios: str='' + celery_broker: str='' def tiktok_config() -> tiktok_config_t.res_t: res = tiktok_config_t.res_t( @@ -36,6 +37,7 @@ def tiktok_config() -> tiktok_config_t.res_t: ), ) + res.celery_broker = 'redis://@redis/1' res.cache = os.path.join( res.project_root, 'tmp/cache/tiktok', diff --git a/python/tasks/tiktok/celery.py b/python/tasks/tiktok/celery.py new file mode 100644 index 0000000..70a1d42 --- /dev/null +++ b/python/tasks/tiktok/celery.py @@ -0,0 +1,10 @@ +from . import tiktok_config + +import celery + +c = tiktok_config() + +celery.Celery( + __name__, + broker=c.celery_broker, +)