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 # 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