Merge pull request #25 from meedan/devops-471-long-running-http

DEVOPS-471 add long running HTTP that is confirmed to work locally, specify ARM architecture, expose port
meedan · Aug 16, 2023 · f65c181 · f65c181
2 parents 22cef39 + 1407363
commit f65c181
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.9
-
+EXPOSE 8000
 WORKDIR /app
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/Makefile b/Makefile
@@ -1,9 +1,7 @@
 .PHONY: run run_http run_worker run_test
 
-run: 
-	uvicorn main:app --reload &
-	python run.py &
-	wait
+run:
+	./start_healthcheck_and_model_engine.sh
 
 run_http:
 	uvicorn main:app --reload

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,7 @@
 version: '3.9'
 services:
   app:
+    platform: linux/amd64
     build: .
     env_file:
       - ./local.env

diff --git a/start_healthcheck_and_model_engine.sh b/start_healthcheck_and_model_engine.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Start the first process in the background
+uvicorn main:app --reload &
+
+# Start the second process in the foreground
+# This will ensure the script won't exit until this process does
+python run.py