From 90af4f73e7dd893039729c89f76cee540dbda92f Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Tue, 30 May 2023 19:39:40 +0200 Subject: [PATCH] Fix --- 8.0/bullseye/apache/Dockerfile | 7 ++++++- 8.0/bullseye/cli/Dockerfile | 7 ++++++- 8.0/bullseye/fpm/Dockerfile | 7 ++++++- 8.0/bullseye/zts/Dockerfile | 7 ++++++- 8.0/buster/apache/Dockerfile | 7 ++++++- 8.0/buster/cli/Dockerfile | 7 ++++++- 8.0/buster/fpm/Dockerfile | 7 ++++++- 8.0/buster/zts/Dockerfile | 7 ++++++- 8.1-rc/bullseye/apache/Dockerfile | 7 ++++++- 8.1-rc/bullseye/cli/Dockerfile | 7 ++++++- 8.1-rc/bullseye/fpm/Dockerfile | 7 ++++++- 8.1-rc/bullseye/zts/Dockerfile | 7 ++++++- 8.1-rc/buster/apache/Dockerfile | 7 ++++++- 8.1-rc/buster/cli/Dockerfile | 7 ++++++- 8.1-rc/buster/fpm/Dockerfile | 7 ++++++- 8.1-rc/buster/zts/Dockerfile | 7 ++++++- 8.1/bullseye/apache/Dockerfile | 7 ++++++- 8.1/bullseye/cli/Dockerfile | 7 ++++++- 8.1/bullseye/fpm/Dockerfile | 7 ++++++- 8.1/bullseye/zts/Dockerfile | 7 ++++++- 8.1/buster/apache/Dockerfile | 7 ++++++- 8.1/buster/cli/Dockerfile | 7 ++++++- 8.1/buster/fpm/Dockerfile | 7 ++++++- 8.1/buster/zts/Dockerfile | 7 ++++++- 8.2-rc/bullseye/apache/Dockerfile | 7 ++++++- 8.2-rc/bullseye/cli/Dockerfile | 7 ++++++- 8.2-rc/bullseye/fpm/Dockerfile | 7 ++++++- 8.2-rc/bullseye/zts/Dockerfile | 7 ++++++- 8.2-rc/buster/apache/Dockerfile | 7 ++++++- 8.2-rc/buster/cli/Dockerfile | 7 ++++++- 8.2-rc/buster/fpm/Dockerfile | 7 ++++++- 8.2-rc/buster/zts/Dockerfile | 7 ++++++- 8.2/bullseye/apache/Dockerfile | 7 ++++++- 8.2/bullseye/cli/Dockerfile | 7 ++++++- 8.2/bullseye/fpm/Dockerfile | 7 ++++++- 8.2/bullseye/zts/Dockerfile | 7 ++++++- 8.2/buster/apache/Dockerfile | 7 ++++++- 8.2/buster/cli/Dockerfile | 7 ++++++- 8.2/buster/fpm/Dockerfile | 7 ++++++- 8.2/buster/zts/Dockerfile | 7 ++++++- 8.2/sid/apache/Dockerfile | 7 ++++++- 8.2/sid/cli/Dockerfile | 7 ++++++- 8.2/sid/fpm/Dockerfile | 7 ++++++- 8.2/sid/zts/Dockerfile | 7 ++++++- Dockerfile-linux.template | 3 +-- build.sh | 6 +++--- 46 files changed, 268 insertions(+), 49 deletions(-) diff --git a/8.0/bullseye/apache/Dockerfile b/8.0/bullseye/apache/Dockerfile index dfc270e4..f9a8d879 100644 --- a/8.0/bullseye/apache/Dockerfile +++ b/8.0/bullseye/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.0/bullseye/cli/Dockerfile b/8.0/bullseye/cli/Dockerfile index 92364a78..0007f71a 100644 --- a/8.0/bullseye/cli/Dockerfile +++ b/8.0/bullseye/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile index eb72a25d..6bd3a4da 100644 --- a/8.0/bullseye/fpm/Dockerfile +++ b/8.0/bullseye/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile index e4062187..4b63885f 100644 --- a/8.0/bullseye/zts/Dockerfile +++ b/8.0/bullseye/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index 54072147..dc2a168f 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index e14364c2..07f32a01 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index ef5ffee3..65d7de33 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index 87e5b56f..4d6d6cd1 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/bullseye/apache/Dockerfile b/8.1-rc/bullseye/apache/Dockerfile index 4f0201b6..ae53d164 100644 --- a/8.1-rc/bullseye/apache/Dockerfile +++ b/8.1-rc/bullseye/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/bullseye/cli/Dockerfile b/8.1-rc/bullseye/cli/Dockerfile index 8fe5a463..be6476fa 100644 --- a/8.1-rc/bullseye/cli/Dockerfile +++ b/8.1-rc/bullseye/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/bullseye/fpm/Dockerfile b/8.1-rc/bullseye/fpm/Dockerfile index 85b6a9eb..e789d198 100644 --- a/8.1-rc/bullseye/fpm/Dockerfile +++ b/8.1-rc/bullseye/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/bullseye/zts/Dockerfile b/8.1-rc/bullseye/zts/Dockerfile index 82174a5e..14f0352c 100644 --- a/8.1-rc/bullseye/zts/Dockerfile +++ b/8.1-rc/bullseye/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/buster/apache/Dockerfile b/8.1-rc/buster/apache/Dockerfile index 95f527c5..27e991b3 100644 --- a/8.1-rc/buster/apache/Dockerfile +++ b/8.1-rc/buster/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/buster/cli/Dockerfile b/8.1-rc/buster/cli/Dockerfile index 565bc663..a6727d4f 100644 --- a/8.1-rc/buster/cli/Dockerfile +++ b/8.1-rc/buster/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/buster/fpm/Dockerfile b/8.1-rc/buster/fpm/Dockerfile index 46e137b5..c4a3352e 100644 --- a/8.1-rc/buster/fpm/Dockerfile +++ b/8.1-rc/buster/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1-rc/buster/zts/Dockerfile b/8.1-rc/buster/zts/Dockerfile index 10c489ea..a3649606 100644 --- a/8.1-rc/buster/zts/Dockerfile +++ b/8.1-rc/buster/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/bullseye/apache/Dockerfile b/8.1/bullseye/apache/Dockerfile index 64daad31..401206f8 100644 --- a/8.1/bullseye/apache/Dockerfile +++ b/8.1/bullseye/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/bullseye/cli/Dockerfile b/8.1/bullseye/cli/Dockerfile index a6088515..d824657f 100644 --- a/8.1/bullseye/cli/Dockerfile +++ b/8.1/bullseye/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile index c7e8400d..d06ad6f2 100644 --- a/8.1/bullseye/fpm/Dockerfile +++ b/8.1/bullseye/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/bullseye/zts/Dockerfile b/8.1/bullseye/zts/Dockerfile index e48bbcac..fe03e100 100644 --- a/8.1/bullseye/zts/Dockerfile +++ b/8.1/bullseye/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/buster/apache/Dockerfile b/8.1/buster/apache/Dockerfile index fb79b09b..0721d777 100644 --- a/8.1/buster/apache/Dockerfile +++ b/8.1/buster/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/buster/cli/Dockerfile b/8.1/buster/cli/Dockerfile index 411b6387..6d001c53 100644 --- a/8.1/buster/cli/Dockerfile +++ b/8.1/buster/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/buster/fpm/Dockerfile b/8.1/buster/fpm/Dockerfile index 041fbea5..26715936 100644 --- a/8.1/buster/fpm/Dockerfile +++ b/8.1/buster/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.1/buster/zts/Dockerfile b/8.1/buster/zts/Dockerfile index 5fd93c0f..0ad6ff44 100644 --- a/8.1/buster/zts/Dockerfile +++ b/8.1/buster/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/bullseye/apache/Dockerfile b/8.2-rc/bullseye/apache/Dockerfile index 379a4013..935bcd6c 100644 --- a/8.2-rc/bullseye/apache/Dockerfile +++ b/8.2-rc/bullseye/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/bullseye/cli/Dockerfile b/8.2-rc/bullseye/cli/Dockerfile index 8503f291..f69e77f7 100644 --- a/8.2-rc/bullseye/cli/Dockerfile +++ b/8.2-rc/bullseye/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/bullseye/fpm/Dockerfile b/8.2-rc/bullseye/fpm/Dockerfile index a79efd9b..e13b5fbc 100644 --- a/8.2-rc/bullseye/fpm/Dockerfile +++ b/8.2-rc/bullseye/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/bullseye/zts/Dockerfile b/8.2-rc/bullseye/zts/Dockerfile index 3edbb942..f35fad4e 100644 --- a/8.2-rc/bullseye/zts/Dockerfile +++ b/8.2-rc/bullseye/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/buster/apache/Dockerfile b/8.2-rc/buster/apache/Dockerfile index 7a845632..02f3e847 100644 --- a/8.2-rc/buster/apache/Dockerfile +++ b/8.2-rc/buster/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/buster/cli/Dockerfile b/8.2-rc/buster/cli/Dockerfile index 9f698ee8..c4d626fb 100644 --- a/8.2-rc/buster/cli/Dockerfile +++ b/8.2-rc/buster/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/buster/fpm/Dockerfile b/8.2-rc/buster/fpm/Dockerfile index be0be5e5..58540057 100644 --- a/8.2-rc/buster/fpm/Dockerfile +++ b/8.2-rc/buster/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2-rc/buster/zts/Dockerfile b/8.2-rc/buster/zts/Dockerfile index 6baaa6fd..905098bd 100644 --- a/8.2-rc/buster/zts/Dockerfile +++ b/8.2-rc/buster/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/bullseye/apache/Dockerfile b/8.2/bullseye/apache/Dockerfile index c6cb4103..f6b94985 100644 --- a/8.2/bullseye/apache/Dockerfile +++ b/8.2/bullseye/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/bullseye/cli/Dockerfile b/8.2/bullseye/cli/Dockerfile index a31cb994..d8f71727 100644 --- a/8.2/bullseye/cli/Dockerfile +++ b/8.2/bullseye/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile index 01467357..bc6ad6dd 100644 --- a/8.2/bullseye/fpm/Dockerfile +++ b/8.2/bullseye/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/bullseye/zts/Dockerfile b/8.2/bullseye/zts/Dockerfile index efa3a6b6..ddf24a9b 100644 --- a/8.2/bullseye/zts/Dockerfile +++ b/8.2/bullseye/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/buster/apache/Dockerfile b/8.2/buster/apache/Dockerfile index acca4179..c44663a3 100644 --- a/8.2/buster/apache/Dockerfile +++ b/8.2/buster/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/buster/cli/Dockerfile b/8.2/buster/cli/Dockerfile index 73e7a8f5..620c5f65 100644 --- a/8.2/buster/cli/Dockerfile +++ b/8.2/buster/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/buster/fpm/Dockerfile b/8.2/buster/fpm/Dockerfile index ef575848..a33deeab 100644 --- a/8.2/buster/fpm/Dockerfile +++ b/8.2/buster/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/buster/zts/Dockerfile b/8.2/buster/zts/Dockerfile index 53bd6db3..d694545c 100644 --- a/8.2/buster/zts/Dockerfile +++ b/8.2/buster/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/sid/apache/Dockerfile b/8.2/sid/apache/Dockerfile index b7219a98..c0ae6c1c 100644 --- a/8.2/sid/apache/Dockerfile +++ b/8.2/sid/apache/Dockerfile @@ -162,8 +162,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ apache2-dev \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -171,7 +172,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/sid/cli/Dockerfile b/8.2/sid/cli/Dockerfile index 1d35eaa6..ae428812 100644 --- a/8.2/sid/cli/Dockerfile +++ b/8.2/sid/cli/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/sid/fpm/Dockerfile b/8.2/sid/fpm/Dockerfile index 48db5565..249d1c8e 100644 --- a/8.2/sid/fpm/Dockerfile +++ b/8.2/sid/fpm/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/8.2/sid/zts/Dockerfile b/8.2/sid/zts/Dockerfile index 4b7e690a..8a470e43 100644 --- a/8.2/sid/zts/Dockerfile +++ b/8.2/sid/zts/Dockerfile @@ -103,8 +103,9 @@ RUN set -eux; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends \ - autoconf \ automake \ + bison \ + build-essential \ libargon2-dev \ libcurl4-openssl-dev \ libonig-dev \ @@ -112,7 +113,11 @@ RUN set -eux; \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ + libtool \ + libtool-bin \ libxml2-dev \ + pkg-config \ + re2c \ zlib1g-dev \ ; \ \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index e9c142c0..97ac9a28 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -262,8 +262,7 @@ RUN set -eux; \ else # debian packages if env.variant == "apache" then "apache2-dev" else empty end, - "autoconf", - "automake", + "pkg-config", "build-essential", "automake", "bison", "re2c", "libtool", "libtool-bin", "libargon2-dev", "libcurl4-openssl-dev", "libreadline-dev", diff --git a/build.sh b/build.sh index 85d1ab86..3d52521b 100755 --- a/build.sh +++ b/build.sh @@ -14,12 +14,12 @@ cd 8.2 base=$PWD -build alpineedge/cli/ 8.2-alpine -build alpineedge/fpm/ 8.2-fpm-alpine - build sid/cli/ 8.2 build sid/fpm/ 8.2-fpm +build alpineedge/cli/ 8.2-alpine +build alpineedge/fpm/ 8.2-fpm-alpine + docker tag danog/php:8.2 danog/php:8.2-debian docker tag danog/php:8.2-fpm danog/php:8.2-fpm-debian