diff --git a/api/Dockerfile b/Dockerfile similarity index 100% rename from api/Dockerfile rename to Dockerfile diff --git a/api/.dockerignore b/api/.dockerignore deleted file mode 100644 index f701699..0000000 --- a/api/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -logs -*.log \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a21fda2..c58fbdb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: redarc: build: - context: ./api + context: . dockerfile: Dockerfile image: redarc container_name: redarc @@ -59,6 +59,7 @@ services: redis: image: redis:7.0.12-alpine3.18 + container_name: redis networks: - redarc ports: @@ -80,8 +81,8 @@ services: env_file: - .env volumes: - - redarc_ingest_logs:/ingest/logs - - redarc_images:/ingest/gallery-dl + - redarc_ingest_logs:/image_downloader/logs + - redarc_images:/image_downloader/gallery-dl depends_on: redis: condition: service_healthy @@ -97,7 +98,7 @@ services: env_file: - .env volumes: - - redarc_ingest_logs:/ingest/logs + - redarc_ingest_logs:/index_worker/logs depends_on: postgres: condition: service_healthy @@ -115,7 +116,7 @@ services: env_file: - .env volumes: - - redarc_ingest_logs:/ingest/logs + - redarc_ingest_logs:/reddit_worker/logs depends_on: postgres: condition: service_healthy @@ -133,7 +134,7 @@ services: env_file: - .env volumes: - - redarc_ingest_logs:/ingest/logs + - redarc_ingest_logs:/subreddit_worker/logs depends_on: redis: condition: service_healthy diff --git a/ingest/image_downloader/.dockerignore b/ingest/image_downloader/.dockerignore index f701699..fc339ba 100644 --- a/ingest/image_downloader/.dockerignore +++ b/ingest/image_downloader/.dockerignore @@ -1,2 +1,3 @@ logs -*.log \ No newline at end of file +*.log +.env \ No newline at end of file diff --git a/ingest/image_downloader/Dockerfile b/ingest/image_downloader/Dockerfile index 35dbe6e..e6d66c2 100644 --- a/ingest/image_downloader/Dockerfile +++ b/ingest/image_downloader/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine3.18 +FROM alpine:3.18 RUN apk update @@ -12,4 +12,4 @@ RUN pip install rq RUN pip install python-dotenv RUN pip install gallery-dl -CMD ["/bin/python3", "image_downloader.py"] \ No newline at end of file +CMD ["python3", "image_downloader.py"] \ No newline at end of file diff --git a/ingest/index_worker/Dockerfile b/ingest/index_worker/Dockerfile index 3e1719c..4e9f51d 100644 --- a/ingest/index_worker/Dockerfile +++ b/ingest/index_worker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine3.18 +FROM alpine:3.18 RUN apk update @@ -11,4 +11,4 @@ COPY . . RUN pip install python-dotenv RUN pip install psycopg2-binary -CMD ["/bin/python3", "index_worker.py"] \ No newline at end of file +CMD ["python3", "index_worker.py"] \ No newline at end of file diff --git a/ingest/index_worker/index_worker.py b/ingest/index_worker/index_worker.py index 0bf6b25..efb6bc6 100644 --- a/ingest/index_worker/index_worker.py +++ b/ingest/index_worker/index_worker.py @@ -142,6 +142,7 @@ def index_db(): if not os.path.exists('logs'): os.makedirs('logs') logging.basicConfig(format='%(asctime)s %(levelname)s %(message)s', filename='logs/index_worker-'+time_now+'.log', encoding='utf-8', level=logging.ERROR, datefmt='%Y-%m-%d %H:%M:%S') + logging.info("Starting index_worker") try: index_db() while True: diff --git a/ingest/reddit_worker/.dockerignore b/ingest/reddit_worker/.dockerignore index f701699..fc339ba 100644 --- a/ingest/reddit_worker/.dockerignore +++ b/ingest/reddit_worker/.dockerignore @@ -1,2 +1,3 @@ logs -*.log \ No newline at end of file +*.log +.env \ No newline at end of file diff --git a/ingest/reddit_worker/Dockerfile b/ingest/reddit_worker/Dockerfile index 4c390c0..ea606b5 100644 --- a/ingest/reddit_worker/Dockerfile +++ b/ingest/reddit_worker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine3.18 +FROM alpine:3.18 RUN apk update @@ -13,4 +13,4 @@ RUN pip install python-dotenv RUN pip install praw RUN pip install psycopg2-binary -CMD ["/bin/python3", "reddit_worker.py"] \ No newline at end of file +CMD ["python3", "reddit_worker.py"] \ No newline at end of file diff --git a/ingest/subreddit_worker/.dockerignore b/ingest/subreddit_worker/.dockerignore index f701699..fc339ba 100644 --- a/ingest/subreddit_worker/.dockerignore +++ b/ingest/subreddit_worker/.dockerignore @@ -1,2 +1,3 @@ logs -*.log \ No newline at end of file +*.log +.env \ No newline at end of file diff --git a/ingest/subreddit_worker/Dockerfile b/ingest/subreddit_worker/Dockerfile index b8ab20a..53e53a0 100644 --- a/ingest/subreddit_worker/Dockerfile +++ b/ingest/subreddit_worker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine3.18 +FROM alpine:3.18 RUN apk update @@ -12,5 +12,4 @@ RUN pip install rq RUN pip install python-dotenv RUN pip install praw -RUN chmod +x entry.sh -CMD ["/bin/python3", "subreddit_worker"] \ No newline at end of file +CMD ["python3", "subreddit_worker.py"] \ No newline at end of file diff --git a/ingest/subreddit_worker/subreddit_worker.py b/ingest/subreddit_worker/subreddit_worker.py index 539110f..ba2221f 100644 --- a/ingest/subreddit_worker/subreddit_worker.py +++ b/ingest/subreddit_worker/subreddit_worker.py @@ -94,6 +94,7 @@ def job_exists(id): return False if __name__ == "__main__": + logging.info("Starting subreddit_worker") try: while True: work()