From e223caff2c56c8d6baadb662907617fa2f64d7d8 Mon Sep 17 00:00:00 2001
From: jingrow <support@jingrow.com>
Date: Mon, 3 Nov 2025 19:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=9E=84=E5=BB=BA=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E7=B3=BB=E7=BB=9F=E4=B8=BAubuntu22.04?=
 =?UTF-8?q?=E5=8F=8A=E5=AF=B9=E5=BA=94=E7=9A=84wkhtml=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jcloud/docker/Dockerfile | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/jcloud/docker/Dockerfile b/jcloud/docker/Dockerfile
index f5806c2..071d523 100644
--- a/jcloud/docker/Dockerfile
+++ b/jcloud/docker/Dockerfile
@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:experimental
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive
@@ -15,6 +15,7 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update \
   git \
   mariadb-client \
   libmariadb-dev \
+  pkg-config \
   pv \
   ntp \
   wget \
@@ -37,6 +38,8 @@ RUN --mount=type=cache,target=/var/cache/apt apt-get update \
   libharfbuzz0b \
   libpangoft2-1.0-0 \
   libpangocairo-1.0-0 \
+  # Chromium and dependencies
+  chromium-browser \
   # wkhtmltopdf dependencies
   ca-certificates \
   fontconfig \
@@ -61,7 +64,7 @@ COPY --chown=root:root supervisord.conf /etc/supervisor/supervisord.conf
 
 # Install Redis from PPA
 RUN --mount=type=cache,target=/var/cache/apt curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
-  && echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb focal main" | tee /etc/apt/sources.list.d/redis.list \
+  && echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb jammy main" | tee /etc/apt/sources.list.d/redis.list \
   && apt-get update \
   && apt-get install --yes --no-install-suggests --no-install-recommends \
   redis-server \
@@ -69,13 +72,12 @@ RUN --mount=type=cache,target=/var/cache/apt curl -fsSL https://packages.redis.i
 
 # Install Python from DeadSnakes PPA
 ENV {{ pg.get_dependency_version("python", True) }}
-RUN --mount=type=cache,target=/var/cache/apt add-apt-repository ppa:deadsnakes/ppa \
+RUN --mount=type=cache,target=/var/cache/apt add-apt-repository -y ppa:deadsnakes/ppa \
   && apt-get update \
   && apt-get install --yes --no-install-suggests --no-install-recommends \
   python${PYTHON_VERSION} \
   python${PYTHON_VERSION}-dev \
   python${PYTHON_VERSION}-venv \
-  python${PYTHON_VERSION}-distutils \
   && rm -rf /var/lib/apt/lists/* \
   `#stage-pre-python`
 
@@ -83,14 +85,14 @@ RUN --mount=type=cache,target=/var/cache/apt add-apt-repository ppa:deadsnakes/p
 # Install wkhtmltopdf
 ENV {{ pg.get_dependency_version("wkhtmltopdf", True) }}
 {% if pg.get_dependency_version("wkhtmltopdf") == '0.12.6' %}
-RUN wget http://npm.jingrow.com:105/wkhtmltox_0.12.6-1.focal_amd64.deb \
-  && dpkg -i wkhtmltox_0.12.6-1.focal_amd64.deb \
-  && rm wkhtmltox_0.12.6-1.focal_amd64.deb \
+RUN wget http://npm.jingrow.com:105/wkhtmltox_0.12.6.1-2.jammy_amd64.deb \
+  && dpkg -i wkhtmltox_0.12.6.1-2.jammy_amd64.deb \
+  && rm wkhtmltox_0.12.6.1-2.jammy_amd64.deb \
   `#stage-pre-wkhtmltopdf`
 {% elif pg.get_dependency_version("wkhtmltopdf") == '0.12.5' %}
-RUN wget http://npm.jingrow.com:105/wkhtmltox_0.12.5-1.focal_amd64.deb \
-  && dpkg -i wkhtmltox_0.12.5-1.focal_amd64.deb \
-  && rm wkhtmltox_0.12.5-1.focal_amd64.deb \
+RUN wget http://npm.jingrow.com:105/wkhtmltox_0.12.5-1.jammy_amd64.deb \
+  && dpkg -i wkhtmltox_0.12.5-1.jammy_amd64.deb \
+  && rm wkhtmltox_0.12.5-1.jammy_amd64.deb \
   `#stage-pre-wkhtmltopdf`
 {% elif pg.get_dependency_version("wkhtmltopdf") == '0.12.4' %}
 RUN wget http://npm.jingrow.com:105/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \