refactor

.github/workflows/docker-hub.yml

@@ -23,6 +23,7 @@ jobs:
     - name: Build Docker image
       run: |
         docker build \
+          --target runtime \
           -t joshuasundance/geospatial-data-converter:${{ github.ref_name }} \
           -t joshuasundance/geospatial-data-converter:latest \
           .

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim-bookworm
+FROM python:3.11-slim-bookworm AS base
 
 RUN adduser --uid 1000 --disabled-password --gecos '' appuser
 USER 1000
@@ -10,9 +10,17 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 RUN pip install --user --no-cache-dir --upgrade pip
 COPY ./requirements.txt /home/appuser/requirements.txt
 RUN pip install --user --no-cache-dir  --upgrade -r /home/appuser/requirements.txt
-
 COPY geospatial-data-converter/ /home/appuser/geospatial-data-converter/
 
+
+FROM base AS test
+
+COPY dev-requirements.txt /home/appuser/dev-requirements.txt
+RUN pip install --user --no-cache-dir --upgrade -r /home/appuser/dev-requirements.txt
+
+
+FROM base AS runtime
+
 WORKDIR /workspace
 EXPOSE 7860
 

dev-requirements.txt

@@ -0,0 +1,2 @@
+pytest==7.4.3
+pytest-cov==4.1.0

docker-compose.yml

@@ -1,24 +1,23 @@
 version: '3.8'
 
 services:
-  geospatial-data-converter:
-    image: geospatial-data-converter:latest
-    build: .
-    ports:
-      - "${APP_PORT:-7860}:${APP_PORT:-7860}"
-    working_dir: /workspace
-    command: [
-      "streamlit", "run",
-      "/home/appuser/geospatial-data-converter/app.py",
-      "--server.port", "${APP_PORT:-7860}",
-      "--server.address", "0.0.0.0",
-      "--server.enableXsrfProtection=false"
-    ]
   test:
-    image: geospatial-data-converter:latest  # Use the same image as your main service
-    build: .
+    container_name: geospatial-data-converter-test
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: test
     volumes:
-      - ./tests:/home/appuser/tests
+      - ./tests/:/home/appuser/tests/
       - ./pyproject.toml:/home/appuser/pyproject.toml
     working_dir: /home/appuser
     command: ["pytest"]
+
+  geospatial-data-converter:
+    container_name: geospatial-data-converter
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: runtime
+    ports:
+      - "${APP_PORT:-7860}:${APP_PORT:-7860}"

pyproject.toml

@@ -1,6 +1,7 @@
 [tool.pytest.ini_options]
 pythonpath = ["geospatial-data-converter"]
 testpaths = ["tests"]
+addopts = "--cov=geospatial-data-converter"
 
 [tool.bumpver]
 current_version = "0.2.1"

requirements.txt

@@ -3,6 +3,5 @@ beautifulsoup4==4.12.2
 geopandas==0.14.1
 lxml==4.9.3
 pyogrio==0.7.2
-pytest==7.4.3
 restgdf==0.9.7
 streamlit==1.29.0