fix(docker): fixed all docker scripts

Yakabuff · Sep 17, 2023 · 2c5442d · 2c5442d
1 parent 4b20c4c
commit 2c5442d
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 20 deletions.
diff --git a/api/Dockerfile → Dockerfile b/api/Dockerfile → Dockerfile
diff --git a/api/.dockerignore b/api/.dockerignore
diff --git 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
@@ -1,2 +1,3 @@
 logs
-*.log
+*.log
+.env
diff --git 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"]
+CMD ["python3", "image_downloader.py"]
diff --git 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"]
+CMD ["python3", "index_worker.py"]
diff --git 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
@@ -1,2 +1,3 @@
 logs
-*.log
+*.log
+.env
diff --git 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"]
+CMD ["python3", "reddit_worker.py"]
diff --git a/ingest/subreddit_worker/.dockerignore b/ingest/subreddit_worker/.dockerignore
@@ -1,2 +1,3 @@
 logs
-*.log
+*.log
+.env
diff --git 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"]
+CMD ["python3", "subreddit_worker.py"]
diff --git 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()