move around setting stuff so that docker build process works

README.md

@@ -59,7 +59,7 @@ The `context.py` file helps with importing the apiserver-packages, so that the t
 To build the docker image of the current version, simply run
 
 ```bash
-docker built -t datacatalog-apiserver ./apiserver
+docker build -t datacatalog-apiserver ./apiserver
 ```
 while in the project root directory.
 

apiserver/.dockerignore

+**/__pycache__
+**/.pytest_cache
+README.md
+Dockerfile
+.dockerignore
\ No newline at end of file

apiserver/Dockerfile

@@ -2,15 +2,19 @@ FROM tiangolo/uvicorn-gunicorn:python3.8
 
 LABEL maintainer="Christian Böttcher <c.boettcher@fz-juelich.de>"
 
-RUN mkdir -p /app/app/data
-RUN mkdir -p /app/app/storage
+RUN mkdir -p /app/data
+RUN mkdir -p /app/apiserver
 
 RUN apt update && apt upgrade -y
 
 RUN pip install --no-cache-dir fastapi
 
-COPY ./__init__.py /app/app/
-COPY ./main.py /app/app/
-COPY ./storage/JsonFileStorageAdapter.py /app/app/storage/
-COPY ./storage/LocationStorage.py /app/app/storage/
-COPY ./storage/__init__.py /app/app/storage/
+ADD . /app/apiserver
+COPY ./config.env /app/apiserver/config.env
+
+# This RUN creates a python file that contains the fastapi app, in a location that is expected by the base docker image
+# This avoids naming conflicts with the packages in the project folder
\ No newline at end of file
+RUN echo "from apiserver.main import app" > /app/main.py
+
+# set data directory properly for the docker container
+RUN sed -i 's_./app/data_/app/data_g' /app/apiserver/config.env
\ No newline at end of file

apiserver/config/settings.py

@@ -10,4 +10,4 @@ class ApiserverSettings(BaseSettings):
 
     class Config:
         env_prefix: str = "datacatalog_apiserver_"
-        env_file: str = "config.env"
+        env_file: str = "apiserver/config.env"
\ No newline at end of file

apiserver/main.py

@@ -19,7 +19,7 @@ from enum import Enum
 settings = ApiserverSettings()
 
 app = FastAPI(
-    title="API-Server for the Data Catalogue"
+    title="API-Server for the Data Catalog"
 )
 
 adapter: AbstractLocationDataStorageAdapter = JsonFileStorageAdapter(settings)