aa

Dockerfile

@@ -18,7 +18,10 @@ RUN apt-get -yqq update && \
       libpq-dev \
       pkg-config \
       python3 \
+      python3-colorama \
       python3-dev \
+      python3-dnspython \
+      python3-packaging \
       python3-pip \
       python3-psutil \
       python3-psycopg2 \
@@ -28,7 +31,6 @@ RUN apt-get -yqq update && \
     # Ubuntu's equivalent packages are too old and/or broken.
     pip3 install \
       --break-system-packages \
-      colorama==0.3.1 \
       docker==7.0.0 \
       mysqlclient==2.2.4 \
       pymongo==4.7.2

frameworks/C++/userver/userver-bare.dockerfile

@@ -1,12 +1,12 @@
-FROM ghcr.io/userver-framework/ubuntu-userver-build-base:v2 AS builder
+FROM ghcr.io/userver-framework/ubuntu-22.04-userver-pg AS builder
 
 RUN apt update && \
     apt install -y lsb-release wget software-properties-common gnupg && \
         wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 16
 
 WORKDIR /src
 RUN git clone https://github.com/userver-framework/userver.git && \
-    cd userver && git checkout c2ca5454f0b0e93dd0a2e082904dedda5cda3052
+    cd userver && git checkout ec1a3b07793f8d4cd0968cd61d8e6079d667a1e7
 
 COPY userver_benchmark/ ./
 RUN mkdir build && cd build && \