From 91b127f46e5b4cc33869d7e10a25e1a0a04429b5 Mon Sep 17 00:00:00 2001
From: Luke Lau <luke@igalia.com>
Date: Mon, 6 Oct 2025 15:09:33 +0000
Subject: [PATCH] Fix Dockerfile

---
 Dockerfile                                    | 28 +++++++++++++++++++
 .../docker-compose.yml => docker-compose.yml  |  6 ++--
 docker/.env                                   |  2 --
 docker/Dockerfile                             | 20 -------------
 requirements.server.txt                       |  4 +--
 5 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 Dockerfile
 rename docker/docker-compose.yml => docker-compose.yml (78%)
 delete mode 100644 docker/.env
 delete mode 100644 docker/Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..4241539e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,28 @@
+FROM python:3.10-alpine
+
+RUN apk update \
+  && apk add --no-cache --virtual .build-deps git g++ postgresql-dev yaml-dev \
+  && apk add --no-cache libpq
+
+WORKDIR /var/src/lnt
+
+COPY requirements.server.txt setup.py .
+# setup.py uses lnt.__version__ etc.
+COPY lnt/__init__.py lnt/__init__.py
+# we build the cperf extension during install
+COPY lnt/testing/profile lnt/testing/profile
+
+RUN pip3 install -r requirements.server.txt \
+  && apk --purge del .build-deps \
+  && mkdir /var/log/lnt
+
+COPY . .
+COPY docker/docker-entrypoint.sh docker/wait_db /usr/local/bin/
+
+VOLUME /var/log
+
+EXPOSE 8000
+
+ENV DB_ENGINE= DB_HOST= DB_USER= DB_PWD= DB_BASE=
+
+ENTRYPOINT docker-entrypoint.sh
diff --git a/docker/docker-compose.yml b/docker-compose.yml
similarity index 78%
rename from docker/docker-compose.yml
rename to docker-compose.yml
index b375b2c3..1f5d0152 100644
--- a/docker/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,8 +21,8 @@ services:
 
   db:
     container_name: lnt-postgres
-    image: postgres:11-alpine
+    image: docker.io/postgres:13-alpine
     environment:
       - POSTGRES_PASSWORD=${DB_PWD}
-      - POSTGRES_USER=${DB_USER}
-      - POSTGRES_DB=${DB_BASE}
+      - POSTGRES_USER=${DB_USER:-lntuser}
+      - POSTGRES_DB=${DB_BASE:-lnt}
diff --git a/docker/.env b/docker/.env
deleted file mode 100644
index cc13f595..00000000
--- a/docker/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-DB_USER=lntuser
-DB_BASE=lnt
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 3537e12c..00000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM python:3.10-alpine
-
-RUN apk update \
-  && apk add --no-cache --virtual .build-deps git g++ postgresql-dev yaml-dev \
-  && apk add --no-cache libpq \
-  && git clone https://github.com/llvm/llvm-lnt /var/src/lnt \
-  && cd /var/src/lnt && pip3 install -r requirements.server.txt \
-  && rm -rf /var/src \
-  && apk --purge del .build-deps \
-  && mkdir /var/log/lnt
-
-COPY docker-entrypoint.sh wait_db /usr/local/bin/
-
-VOLUME /var/log
-
-EXPOSE 8000
-
-ENV DB_ENGINE= DB_HOST= DB_USER= DB_PWD= DB_BASE=
-
-ENTRYPOINT docker-entrypoint.sh
diff --git a/requirements.server.txt b/requirements.server.txt
index 7fc6ed6b..da12deda 100644
--- a/requirements.server.txt
+++ b/requirements.server.txt
@@ -2,6 +2,6 @@
 .
 psycopg2==2.9.10
 gunicorn==19.9.0
-Jinja2==3.1.6
+Jinja2==2.11.3
 progressbar2
-pyyaml==6.0
+pyyaml==5.1.2