From 0cd823094b714a53fc3570681f2396a67f3ea4bc Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 7 Feb 2026 16:43:27 +0800
Subject: [PATCH] Update Dockerfiles: use CMake build and pcre2-dev

The alpine Dockerfile still used autotools (autogen.sh/configure) which
were removed. Switch to cmake build and replace pcre-dev with pcre2-dev.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 docker/alpine/Dockerfile        | 11 +++++------
 docker/build/builder.Dockerfile |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
index f6988d48..392e65a0 100644
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -14,21 +14,20 @@ COPY . /tmp/repo
 RUN set -x \
  # Build environment setup
  && apk add --no-cache --virtual .build-deps \
-      autoconf \
-      automake \
       build-base \
+      cmake \
       c-ares-dev \
       libcap \
       libev-dev \
-      libtool \
       libsodium-dev \
       linux-headers \
       mbedtls-dev \
-      pcre-dev \
+      pcre2-dev \
  # Build & install
  && cd /tmp/repo \
- && ./autogen.sh \
- && ./configure --prefix=/usr/local --disable-documentation \
+ && git submodule update --init --recursive || true \
+ && mkdir -p build && cd build \
+ && cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DWITH_DOC=OFF -DCMAKE_BUILD_TYPE=Release \
  && make -j$(getconf _NPROCESSORS_ONLN) \
  && make install \
  && cd /usr/local/bin \
diff --git a/docker/build/builder.Dockerfile b/docker/build/builder.Dockerfile
index a1402c57..8aa92c21 100644
--- a/docker/build/builder.Dockerfile
+++ b/docker/build/builder.Dockerfile
@@ -5,4 +5,4 @@ MAINTAINER wener <wenermail@gmail.com>
 # Better for cache and dev
 RUN apk add --no-cache --virtual .build-deps \
     alpine-sdk cmake \
-    linux-headers libev-dev libsodium-dev mbedtls-static mbedtls-dev pcre-dev udns-dev
+    linux-headers libev-dev libsodium-dev mbedtls-static mbedtls-dev pcre2-dev udns-dev