Improve ODP API deployment

deploy/metadata-services.yml

@@ -25,8 +25,7 @@ services:
       - "8888:8888"
     environment:
       - SERVER_ENV
-      - SERVER_HOST=0.0.0.0
-      - SERVER_PORT=8888
+      - PATH_PREFIX=/api
       - ACCOUNTS_API_URL=${ODP_ADMIN_URL}/api
       - METADATA.ADAPTER=CKANAdapter
       - METADATA.OAUTH2_SCOPE=ODP.Metadata

deploy/metadata-services/odp-api/Dockerfile-development

@@ -19,4 +19,4 @@ ARG CA_CERT_URL
 RUN curl ${CA_CERT_URL} -k -f -o /usr/local/share/ca-certificates/saeon-internal-ca.crt; exit 0
 RUN update-ca-certificates
 
-CMD ["python", "ODP-API/odpapi/main.py"]
+CMD ["uvicorn", "odpapi:app", "--host", "0.0.0.0", "--port", "8888"]

deploy/metadata-services/odp-api/Dockerfile-production

@@ -19,4 +19,4 @@ ARG CA_CERT_URL
 RUN curl ${CA_CERT_URL} -k -f -o /usr/local/share/ca-certificates/saeon-internal-ca.crt; exit 0
 RUN update-ca-certificates
 
-CMD ["python", "ODP-API/odpapi/main.py"]
+CMD ["uvicorn", "odpapi:app", "--host", "0.0.0.0", "--port", "8888"]

deploy/metadata-services/odp-api/Dockerfile-staging

@@ -19,4 +19,4 @@ ARG CA_CERT_URL
 RUN curl ${CA_CERT_URL} -k -f -o /usr/local/share/ca-certificates/saeon-internal-ca.crt; exit 0
 RUN update-ca-certificates
 
-CMD ["python", "ODP-API/odpapi/main.py"]
+CMD ["uvicorn", "odpapi:app", "--host", "0.0.0.0", "--port", "8888"]

deploy/metadata-services/odp-api/requirements.txt

@@ -1,12 +1,13 @@
-certifi==2020.4.5.1
+certifi==2020.4.5.2
 chardet==3.0.4
 ckanapi==4.3
 click==7.1.2
 dnspython==1.16.0
 docopt==0.6.2
 elasticsearch==6.8.1
 email-validator==1.1.1
-fastapi==0.54.2
+fastapi==0.55.1
+gunicorn==20.0.4
 h11==0.9.0
 httptools==0.1.1
 idna==2.9
@@ -15,7 +16,7 @@ pydantic==1.5.1
 python-dotenv==0.13.0
 python-slugify==4.0.0
 requests==2.23.0
-six==1.14.0
+six==1.15.0
 SQLAlchemy==1.3.17
 starlette==0.13.2
 text-unidecode==1.3