Reorg 2024 08 19

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install postgresql
         uses: tj-actions/install-postgresql@v3
         with:
-          postgresql-version: 11
+          postgresql-version: 12
       - uses: actions/checkout@v3
       - name: Include ppa repository
         run: sudo add-apt-repository ppa:deadsnakes/ppa

.github/workflows/docker.yml

@@ -26,7 +26,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile.develop.${{ matrix.dockerfile-suffix }}
+          file: ./tests/dockerfiles/Dockerfile.${{ matrix.dockerfile-suffix }}
           push: false
           load: true
           tags: test:latest

Dockerfile.develop

@@ -0,0 +1,43 @@
+FROM registry.altlinux.org/alt/base:p10
+
+RUN apt-get update && apt-get install -y \
+    python3-module-async-timeout \
+    python3-module-asyncpg \
+    python3-module-cachetools \
+    python3-module-jinja2 \
+    python3-module-pip \
+    python3-module-psycopg2 \
+    python3-module-requests \
+    python3-module-starlette \
+    python3-module-uvicorn \
+    && find /var/lib/apt/lists/ -type f -delete
+
+RUN apt-get update && apt-get install -y \
+    gcc make \
+    git \
+    postgresql15-server \
+    python3-modules-sqlite3 \
+    && find /var/lib/apt/lists/ -type f -delete
+
+RUN git clone https://github.com/eradman/ephemeralpg.git \
+    && cd ephemeralpg \
+    && make && make install \
+    && cd .. \
+    && rm -rf ephemeralpg/
+
+RUN python3 -m pip install wdb
+
+ENV PATH="/usr/lib/postgresql/15/bin:${PATH}"
+# take out coverage report from source directory
+ENV COVERAGE_FILE="/tmp/qllr.coverage"
+
+COPY --chown=apache . /opt/qllr
+
+WORKDIR /opt/qllr
+
+RUN python3 -m pip install --no-deps -r requirements.txt
+RUN python3 -m pip install -r requirements_dev.txt
+
+USER apache
+
+CMD ["sh", "-c", "./docker/entrypoint.py && ./main.py"]

Dockerfile.production

@@ -1,25 +1,23 @@
-FROM debian:buster
+FROM registry.altlinux.org/alt/base:p10
 
 RUN apt-get update && apt-get install -y \
-    python3-asgiref \
-    python3-click \
-    python3-cachetools \
-    python3-h11 \
-    python3-jinja2 \
-    python3-idna \
-    python3-pip \
-    python3-psycopg2 \
-    python3-requests \
-    python3-sniffio \
-    python3-typing-extensions \
-    && rm -rf /var/lib/apt/lists/*
+    python3-module-async-timeout \
+    python3-module-asyncpg \
+    python3-module-cachetools \
+    python3-module-jinja2 \
+    python3-module-pip \
+    python3-module-psycopg2 \
+    python3-module-requests \
+    python3-module-starlette \
+    python3-module-uvicorn \
+    && find /var/lib/apt/lists/ -type f -delete
 
-COPY --chown=www-data . /opt/qllr
+COPY --chown=apache . /opt/qllr
 
 WORKDIR /opt/qllr
 
-RUN python3 -m pip install -r requirements.txt
+RUN python3 -m pip install --no-deps -r requirements.txt
 
-USER www-data
+USER apache
 
 CMD ["sh", "-c", "./docker/entrypoint.py && ./main.py"]

docker-compose.yml

@@ -25,8 +25,20 @@ services:
   dev:
     build:
       context: .
-      dockerfile: Dockerfile.develop.buster
+      dockerfile: Dockerfile.develop
     volumes:
       - .:/opt/qllr
     ports:
       - "127.0.0.1:7081:8000"
+    environment:
+      - DATABASE_URL=postgres://eugene:bebebe@db:5432/qllr
+      - HOST=0.0.0.0
+      - PORT=8000
+      - WDB_SOCKET_SERVER=wdb
+      - WDB_NO_BROWSER_AUTO_OPEN=True
+    depends_on: ["wdb", "db"]
+
+  wdb:
+    image: kozea/wdb:3.3.0
+    ports:
+      - "127.0.0.1:1984:1984"