climsoft fork, opencdms-process not yet installed

Author: faysal-ishtiaq

docker-compose.prod.yml

@@ -131,7 +131,7 @@ services:
     command:
       [
         "uvicorn",
-        "opencdms_api.main:app",
+        "src.opencdms_api.main:app",
         "--host",
         "0.0.0.0",
         "--port",

docker-compose.yml

@@ -88,13 +88,12 @@ services:
       - opencdms_climsoftdb
     volumes:
       - ./src:/code/src
-      - ./surface:/code/surface
     networks:
       - opencdms_api_dev_network
     command:
       [
         "uvicorn",
-        "opencdms_api.main:app",
+        "src.opencdms_api.main:app",
         "--host",
         "0.0.0.0",
         "--port",

dockerfile

@@ -1,41 +1,33 @@
 FROM python:3.9.7-slim-bullseye
 
-# https://docs.python.org/3/using/cmdline.html#envvar
-# https://pip.pypa.io/en/stable/user_guide/#environment-variables
-# https://python-poetry.org/docs/configuration/
 ENV PYTHONFAULTHANDLER=1 \
     PYTHONHASHSEED=random \
     PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
     PIP_DEFAULT_TIMEOUT=100 \
     PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    PIP_NO_CACHE_DIR=1 \
-    POETRY_VERSION=1.1.11 \
-    POETRY_VIRTUALENVS_CREATE=0
+    PIP_NO_CACHE_DIR=1
 
 RUN apt-get update --fix-missing
 RUN apt-get install -y g++ libgdal-dev libpq-dev libgeos-dev libproj-dev openjdk-17-jre vim wait-for-it
-RUN apt-get install -y curl git && pip install --upgrade pip "poetry==${POETRY_VERSION}"
+RUN apt-get install -y curl git && pip install --upgrade pip
 
 WORKDIR /code
 
-# TODO replace with actual surface repo
-RUN git clone --branch refactor-for-opencdms-server https://github.com/Shaibujnr/surface.git surface
+RUN git clone https://github.com/opencdms/surface.git
 
 RUN pip install numpy==1.21.2 --no-warn-script-location
 RUN pip install -r surface/api/requirements.txt
 
-# Install Python dependencies.
-COPY pyproject.toml poetry.lock ./
+COPY requirements.txt ./requirements.txt
+RUN pip install -r requirements.txt
 
-
-RUN poetry install -v
-
-
-COPY . .
-
-
-RUN poetry install
+COPY ./src ./src
+COPY ./scripts ./scripts
+COPY entrypoint.sh ./entrypoint.sh
+COPY init_climsoft_db.py ./init_climsoft_db.py
+COPY mch.dbn ./mch.dbn
+COPY MCHtablasycampos.def ./MCHtablasycampos.def
 
 RUN useradd -m opencdms_api_user && chown -R opencdms_api_user /code