simplify

broadinstitute · Sep 21, 2023 · 28d65b4 · 28d65b4
1 parent 300c3ec
commit 28d65b4
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 36 deletions.
diff --git a/deploy/docker/hail_search/Dockerfile b/deploy/docker/hail_search/Dockerfile
@@ -4,19 +4,9 @@ LABEL maintainer="Broad TGG"
 
 WORKDIR /hail_search
 
-# Install dependencies.
-# (Explicitly not using a build image w/ venev here because our additional requirements are minimal... for now)
-COPY hail_search/requirements-deploy.txt .
-RUN pip install --no-cache-dir -r requirements-deploy.txt
-
-# Deployment utilities
-COPY deploy/docker/hail_search/gunicorn_config.py /
-COPY deploy/docker/hail_search/readiness_probe /
-COPY deploy/docker/hail_search/start_server.sh /
-
 # Application Code
 COPY hail_search/ .
 
 WORKDIR /
 EXPOSE 8000
-CMD ["/start_server.sh"]
+CMD ["python", "-m", "hail_search"]
diff --git a/deploy/docker/hail_search/gunicorn_config.py b/deploy/docker/hail_search/gunicorn_config.py
diff --git a/deploy/docker/hail_search/readiness_probe b/deploy/docker/hail_search/readiness_probe
diff --git a/deploy/docker/hail_search/start_server.sh b/deploy/docker/hail_search/start_server.sh
diff --git a/hail_search/__main__.py b/hail_search/__main__.py
@@ -7,12 +7,11 @@
 
 def run():
     logging.basicConfig(level=logging.INFO)
-    hl.init()
     app = init_web_app()
     web.run_app(
         app,
         host='0.0.0.0',  # nosec
-        port=5000,
+        port=8000,
         access_log_format='%{From}i "%r" %s %Tfs',
     )
 

diff --git a/hail_search/requirements-deploy.in b/hail_search/requirements-deploy.in
diff --git a/hail_search/requirements-deploy.txt b/hail_search/requirements-deploy.txt
diff --git a/hail_search/web_app.py b/hail_search/web_app.py
@@ -36,5 +36,6 @@ async def init_web_app():
         web.post('/search', search),
         web.post('/gene_counts', gene_counts),
     ])
+    hl.init(idempotent=True)
     load_globals()
     return app