From bf1c251f6df9dbda4594c7c35a98c0bcd8e39d86 Mon Sep 17 00:00:00 2001
From: ShahanaFarooqui <shahana.farooqui@gmail.com>
Date: Sat, 25 Oct 2025 01:02:14 -0700
Subject: [PATCH] gltestserver: Fix Dockerfile build failures and dockerignore
 .venv

---
 .dockerignore                   |  4 +--
 docker/gl-testserver/Dockerfile | 45 +++++++++++++++++----------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 1b2096536..2e77c2d3f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,9 +2,9 @@ libs/target
 libs/gl-client-js/node_modules
 libs/gl-client-js/build
 libs/gl-client-js/index.node
-.venv
+.venv/
+**/.venv/
 dist
-venv
 target
 docker
 site
diff --git a/docker/gl-testserver/Dockerfile b/docker/gl-testserver/Dockerfile
index c88b8c931..3686f54e7 100644
--- a/docker/gl-testserver/Dockerfile
+++ b/docker/gl-testserver/Dockerfile
@@ -1,7 +1,7 @@
 ############################
 # Stage 1: builder
 ############################
-FROM rust:slim-bullseye AS builder
+FROM rust:slim-bookworm AS builder
 
 #---------------------------------------------------------------------
 # Build-time arguments & environment variables
@@ -14,11 +14,11 @@ ARG REPO_PATH=/repo
 ARG TARGETPLATFORM
 ARG TARGETARCH
 
+ENV UV_PYTHON=3.10
 ENV PROTOC_VERSION=3.19.3
 ENV CFSSL_VERSION=1.6.5
 ENV PATH=/home/${DOCKER_USER}/.local/bin:/opt/bitcoin/bin:/usr/local/bin:$PATH
 ENV CARGO_TARGET_DIR=/tmp/target
-ENV REPO=${REPO_PATH}
 
 #---------------------------------------------------------------------
 # Base packages required for building
@@ -26,12 +26,8 @@ ENV REPO=${REPO_PATH}
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends \
-    python3 python3-venv python3-pip \
-    python3-dev \
-    libpq-dev \
     build-essential \
-    git \
-    curl wget unzip sudo ca-certificates \
+    git curl wget unzip sudo \
     && rm -rf /var/lib/apt/lists/*
 
 #---------------------------------------------------------------------
@@ -114,7 +110,7 @@ RUN cargo build --release \
 WORKDIR ${REPO_PATH}/libs/gl-testserver
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 RUN --mount=type=cache,target=/root/.cache/uv \
-    uv lock && uv sync --locked -v --no-editable
+    uv lock && uv sync --locked -v --no-editable --all-packages --dev
 
 #---------------------------------------------------------------------
 # Collect all artifacts into /opt/stage
@@ -134,7 +130,7 @@ RUN mkdir -p /opt/stage/bin /opt/stage/bitcoin && \
 ############################
 # Stage 2: runtime
 ############################
-FROM ubuntu:22.04
+FROM ubuntu:24.04 AS final
 
 #---------------------------------------------------------------------
 # Minimal runtime packages
@@ -142,9 +138,7 @@ FROM ubuntu:22.04
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive \
     apt-get install -y --no-install-recommends \
-    python3 \
-    libpq5 \
-    curl \
+    libpq5 curl openssl ca-certificates build-essential \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 #---------------------------------------------------------------------
@@ -155,16 +149,26 @@ ARG UID=0
 ARG DOCKER_USER=dev
 ARG REPO_PATH=/repo
 
+ENV UV_PYTHON=3.10
 ENV PATH=/home/${DOCKER_USER}/.local/bin:/usr/local/bin:/opt/bitcoin/bin:$PATH
-ENV REPO=${REPO_PATH}
+ENV REPO_PATH=${REPO_PATH}
 ENV GL_TESTING_IGNORE_HASH=False
 
 #---------------------------------------------------------------------
 # Create runtime user
 #---------------------------------------------------------------------
-RUN groupadd -g ${GID} -o ${DOCKER_USER} && \
-    useradd -m -u ${UID} -g ${GID} -s /bin/bash ${DOCKER_USER}
+RUN if getent passwd $UID > /dev/null; then \
+        existing_user=$(getent passwd $UID | cut -d: -f1); \
+        if [ "$existing_user" != "$DOCKER_USER" ]; then \
+            usermod -l $DOCKER_USER -d /home/$DOCKER_USER -m $existing_user; \
+            groupmod -n $DOCKER_USER $(getent group $GID | cut -d: -f1); \
+        fi; \
+    else \
+        groupadd --gid $GID $DOCKER_USER; \
+        useradd --uid $UID --gid $GID -m $DOCKER_USER; \
+    fi
 
+USER ${DOCKER_USER}
 #---------------------------------------------------------------------
 # Copy artifacts from the builder stage
 #---------------------------------------------------------------------
@@ -174,14 +178,11 @@ COPY --from=builder /opt/stage/bitcoin    /opt/bitcoin
 #---------------------------------------------------------------------
 # Application code (copy only libs to keep image small)
 #---------------------------------------------------------------------
-ADD . ${REPO}
-COPY --from=builder /opt/stage/uv ${REPO}/.venv
-RUN chown -R ${DOCKER_USER}:${DOCKER_USER} ${REPO}
-
-USER ${DOCKER_USER}
-WORKDIR ${REPO}/libs/gl-testserver/
+WORKDIR ${REPO_PATH}
+COPY --chown=${DOCKER_USER}:${DOCKER_USER} . ${REPO_PATH}
+COPY --from=builder /opt/stage/uv ${REPO_PATH}/.venv
 
 #---------------------------------------------------------------------
 # ENTRYPOINT
 #---------------------------------------------------------------------
-CMD . ${REPO}/.venv/bin/activate && python3 gltestserver run --metadata ${REPO}/ --directory ${REPO}/.gltestserver
+CMD uv run --package gltestserver gltestserver run --directory ${REPO_PATH}/.gltestserver