Rewrite Dockerfile with uv setup; Update README; Update pyproject.toml dependencies

Author: cwang39403

Dockerfile

@@ -1,26 +1,23 @@
-FROM python:3.10-alpine
+FROM python:3.10-slim
 
-ENV HOSTNAME=localhost
-ENV PORT=5000
-ENV MONGODB_HOST=localhost
-ENV MONGODB_PORT=27017
+RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates
 
-RUN apk add --update --no-cache g++ gcc libxslt-dev
+# Steps to install uv (https://docs.astral.sh/uv/guides/integration/docker/#installing-uv)
+ENV UV_VERSION=0.8.13
+ADD https://astral.sh/uv/$UV_VERSION/install.sh /uv-installer.sh
 
-COPY requirements.txt /tmp/
+# Run the installer then remove it
+RUN sh /uv-installer.sh && rm /uv-installer.sh
 
-RUN pip install --no-cache-dir -r /tmp/requirements.txt &&\
-    addgroup -g 1000 esdlgroup &&\
-    adduser -u 1000 -G esdlgroup -h /home/esdluser -D esdluser &&\
-    mkdir /storage &&\
-    chown esdluser: /storage
+# Ensure the installed binary is on the `PATH`
+ENV PATH="/root/.local/bin/:$PATH"
 
-VOLUME /storage
+WORKDIR /code
 
-WORKDIR /home/esdluser
-
-USER esdluser
+# Install dependencies
+COPY ./pyproject.toml ./uv.lock ./
+RUN uv sync
 
 COPY . .
 
-CMD ["sh", "-c", "waitress-serve --listen *:$PORT --call esdlvalidator.api.manage:create_app"]
+CMD ["uv", "run", "waitress-serve", "--listen", "*:5000", "--call", "esdlvalidator.api.manage:create_app"]

README.md

@@ -191,6 +191,13 @@ To run the service in debug mode.
 uv run app.py
 ```
 
+### Run ESDL-validator using waitress
+
+An example how to start the service using waitress.
+
+```
+uv run waitress-serve --listen="*:8080" --call "esdlvalidator.api.manage:create_app"
+```
 
 ### Testing
 
@@ -227,7 +234,6 @@ Setting up Git hooks...
 ✅ Git hook installed: .git/hooks/pre-push
 ```
 
-
 #### Examples
 
 When pushing to the internal gitlab repository with `git push`, you would see message like below and then proceed.
@@ -250,31 +256,13 @@ esdlvalidator/validation/functions/projects/nwn/test.py
 
 ## Docker
 
-To test locally on docker desktop:
-
-```
-docker-compose up --build
-```
-
-Then go to [localhost:3011]() and `schema` POST to add a validation schema, `schema` GET will give a list of loaded
-schemas.
-To test the validator use `validationToMessages` POST with the esdl in regular text and the schema ID.
-
-### OLD
-
-Build example
-
-```
-docker build -t esdl-validator .
-```
-
-Run example for esdl-validator with logging set to DEBUG and the database file stored and read outside of the container.
+To test locally with docker desktop:
 
 ```
-docker run -p 8080:80 -v C:\temp:/storage -e ESDLVALIDATOR_LOG_LEVEL=DEBUG esdl-validator
+docker-compose -f docker-compose.yml up --build -d
 ```
 
-The service should now be accesible on ```localhost:8080```
+The service should now be accesible on ```localhost:3011```
 
 ## Validation
 

docker-compose-poc.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 networks:
   mapeditor-net:
     driver: bridge
@@ -15,6 +13,7 @@ services:
       - MONGODB_HOST=mongo
       - MONGODB_PORT=27017
       - PYTHONUNBUFFERED=1
+      - ESDLVALIDATOR_LOG_LEVEL=DEBUG
     volumes:
       - validator-storage:/storage
     networks:

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 networks:
   esdl_val_net:
 

pyproject.toml

@@ -12,8 +12,9 @@ dependencies = [
     "flask-cors>=6.0.1",
     "flask-restx>=1.3.0",
     "pyesdl>=25.7",
-    "pymongo>=4.14.1",
+    "pymongo<=4.13",
     "tinydb>=4.8.2",
+    "waitress>=3.0.2",
 ]
 
 [dependency-groups]