From bff652edb4d574abd30ed5b64e742accabe26b98 Mon Sep 17 00:00:00 2001
From: Kim Gustyr <kim.gustyr@flagsmith.com>
Date: Sat, 17 Jan 2026 01:03:53 +0000
Subject: [PATCH 1/2] ci: Devcontainer-ready test images

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 85b9c4b978e3..ad641ae4bdb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,7 +87,7 @@ FROM wolfi-base AS build-python
 WORKDIR /build
 
 ARG PYTHON_VERSION
-RUN apk add build-base linux-headers curl git \
+RUN apk add build-base linux-headers curl git bash \
   python-${PYTHON_VERSION} \
   python-${PYTHON_VERSION}-dev \
   py${PYTHON_VERSION}-pip

From d0e231539fb4482631f6722b800352fea85f56c8 Mon Sep 17 00:00:00 2001
From: Kim Gustyr <kim.gustyr@flagsmith.com>
Date: Wed, 21 Jan 2026 10:03:49 +0000
Subject: [PATCH 2/2] add postgres for CI

---
 Dockerfile | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ad641ae4bdb5..70b46f6b7160 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,7 @@
 
 # - Internal stages
 # * api-test [build-python]
+# * api-private-test [build-python-private]
 
 # - Target (shippable) stages
 # * private-cloud-api [api-runtime-private, build-python-private]
@@ -87,7 +88,7 @@ FROM wolfi-base AS build-python
 WORKDIR /build
 
 ARG PYTHON_VERSION
-RUN apk add build-base linux-headers curl git bash \
+RUN apk add build-base linux-headers curl git postgresql \
   python-${PYTHON_VERSION} \
   python-${PYTHON_VERSION}-dev \
   py${PYTHON_VERSION}-pip
@@ -158,13 +159,23 @@ RUN apk add xmlsec
 # * api-test [build-python]
 FROM build-python AS api-test
 
+COPY api /build/
+
 RUN make install-packages opts='--with dev'
 
-WORKDIR /app
+CMD ["make", "test"]
 
-COPY api /app/
+# * api-private-test [build-python-private]
+FROM build-python-private AS api-private-test
+
+COPY api /build/
+
+RUN make install-packages opts='--with dev' && \
+  make integrate-private-tests && \
+  git config --global --unset credential.helper && \
+  rm -f ${HOME}/.git-credentials
 
-CMD ["make test"]
+CMD ["make", "test"]
 
 # - Target (shippable) stages
 # * private-cloud-api [api-runtime-private, build-python-private]