Unify ingestion server and indexer worker config

WordPress · Jul 12, 2023 · e024346 · e024346
1 parent a127304
commit e024346
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 49 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -265,7 +265,7 @@ services:
       args: # Automatically inferred from env vars, unless specified
         - INGESTION_PY_VERSION
     image: openverse-ingestion_server
-    command: gunicorn -c ./gunicorn_worker.conf.py
+    command: gunicorn indexer_worker:api --bind 0.0.0.0:8002
     expose:
       - "8002"
     depends_on:

diff --git a/ingestion_server/Dockerfile b/ingestion_server/Dockerfile
@@ -78,4 +78,4 @@ COPY --chown=ingestionu . /ingestion_server/
 # - 8002: Gunicorn server for `indexer_worker` Falcon app
 EXPOSE 8001 8002
 
-CMD ["gunicorn", "-c", "./gunicorn.conf.py"]
+CMD ["gunicorn", "--bind", "0.0.0.0:8001", "api:api"]
diff --git a/ingestion_server/gunicorn.conf.py b/ingestion_server/gunicorn.conf.py
@@ -1,4 +1,3 @@
-bind = ["0.0.0.0:8001"]
 capture_output = True
 accesslog = "-"
 errorlog = "-"
@@ -42,4 +41,3 @@
     },
 }
 loglevel = "debug"
-wsgi_app = "api:api"
diff --git a/ingestion_server/gunicorn_worker.conf.py b/ingestion_server/gunicorn_worker.conf.py