major refactor of structure for worker V web: docker/app/secrets/envs/...

docker-compose.yml

@@ -1,13 +1,3 @@
-# reusable YAML variables
-x-broker-url: &broker-url "redis://:${REDIS_PASSWORD}@redis:6379/0"
-
-x-base-setup: &base-setup
-  build: ./src
-  restart: always
-  env_file: src/.env.prod
-  environment:
-    CELERY_BROKER_URL: *broker-url
-    CELERY_RESULT_BACKEND: *broker-url
 
 volumes:
   crawls:
@@ -15,13 +5,21 @@ volumes:
 name: "auto-archiver-api"
 services:
   web:
-    <<: *base-setup
+    build: 
+      context: .
+      dockerfile: worker.Dockerfile
+    restart: always
+    env_file: .env.prod
+    environment:
+      CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0
     ports:
       - "127.0.0.1:8004:8000"
     #TODO: should prod have the --reload flag?
-    command: uvicorn web:app --factory --host 0.0.0.0 --reload
+    command: uvicorn app.web:app --factory --host 0.0.0.0
     volumes:
-      - ./src:/app
+      # - ./app:/app
+      - ./app/logs:/aa-api/app/logs
+      - ./app/database:/aa-api/app/database
     depends_on:
       - redis
     healthcheck:
@@ -31,16 +29,19 @@ services:
       retries: 3
 
   worker:
-    <<: *base-setup
-    command: celery --app=worker.main.celery worker --loglevel=info --logfile=logs/celery.log
+    build: 
+      context: .
+      dockerfile: worker.Dockerfile
+    restart: always
+    env_file: .env.prod
+    command: celery --app=app.worker.main.celery worker --loglevel=info --logfile=/aa-api/app/logs/celery.log
     volumes:
-      - ./src:/app
+      - ./app/logs:/aa-api/app/logs
+      - ./app/database:/aa-api/app/database
       - /var/run/docker.sock:/var/run/docker.sock
       - crawls:/crawls # BROWSERTRIX_HOME_HOST:BROWSERTRIX_HOME_CONTAINER, do not change /crawls
     environment:
-      # celery broker-url needs to be duplicated here, do not remove
-      CELERY_BROKER_URL: *broker-url
-      CELERY_RESULT_BACKEND: *broker-url
+      CELERY_BROKER_URL: redis://:${REDIS_PASSWORD}@redis:6379/0
       WACZ_ENABLE_DOCKER: 1 # Enable calling docker from this container
       BROWSERTRIX_HOME_HOST: auto-archiver-api_crawls
       BROWSERTRIX_HOME_CONTAINER: /crawls
@@ -58,8 +59,8 @@ services:
     restart: always
     command: redis-server /conf/redis.conf --requirepass ${REDIS_PASSWORD}
     volumes:
-      - "./redis/data:/data"
-      - "./redis/config:/conf"
+      - ./redis/data:/data
+      - ./redis/config:/conf
     healthcheck:
       test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"]
       interval: 30s