From d8e1dece548f4e53be4cd63cb577ae0a3855c43d Mon Sep 17 00:00:00 2001
From: antonyzhilin <antonyzhilin@userver.tech>
Date: Wed, 22 Jan 2025 22:34:36 +0300
Subject: [PATCH] fix docker: add ubuntu-22.04-pg-dev image (take 3)
 commit_hash:229acb1fbe72f1a0e4a7454d8e81595f26f67e11

---
 scripts/docker/ubuntu-22.04-pg-dev.dockerfile | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/scripts/docker/ubuntu-22.04-pg-dev.dockerfile b/scripts/docker/ubuntu-22.04-pg-dev.dockerfile
index e273c7a5a87d..79c7fd976ad6 100644
--- a/scripts/docker/ubuntu-22.04-pg-dev.dockerfile
+++ b/scripts/docker/ubuntu-22.04-pg-dev.dockerfile
@@ -1,6 +1,24 @@
-FROM ghcr.io/userver-framework/ubuntu-22.04-userver-pg:latest
+FROM ghcr.io/userver-framework/ubuntu-22.04-userver-base:latest
 
+# Setup clang toolchain, add "user" user
 COPY scripts/docker/setup-dev.sh /userver_tmp/
 RUN /userver_tmp/setup-dev.sh && rm -rf /userver_tmp
 
+# Install postgresql server
+RUN \
+  apt update && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    postgresql-14 \
+    pycodestyle \
+    && \
+  apt clean all
+
+# Build and install userver
+COPY ./ /app/userver
+
+RUN ( \
+  cd /app/userver \
+  && PACKAGE_OPTIONS='-D CPACK_DEBIAN_PACKAGE_DEPENDS=libc6' ./scripts/build_and_install_all.sh \
+  && rm -rf /app/userver \
+)
+
 EXPOSE 8080-8100