diff --git a/php/base/Dockerfile b/php/base/Dockerfile index 1fa3bdd..c247b93 100644 --- a/php/base/Dockerfile +++ b/php/base/Dockerfile @@ -200,6 +200,8 @@ COPY --from=builder /var/lib/php/ /var/lib/php/ RUN \ set -eux \ && apt-get update \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get install -y --no-install-recommends --allow-downgrades \ libxml2 libssl3t64 libsqlite3-0 libbz2-1.0 libidn2-0 \ zstd libbrotli1 libpsl5t64 libgsasl18 rtmpdump librtmp1 libnghttp3-9 nghttp2 \ diff --git a/php/fpm/Dockerfile b/php/fpm/Dockerfile index b127439..1695e2e 100644 --- a/php/fpm/Dockerfile +++ b/php/fpm/Dockerfile @@ -147,7 +147,8 @@ COPY --from=builder /var/lib/php/ /var/lib/php/ RUN \ set -eux \ && apt-get update \ -&& apt-get upgrade -y \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get install -y --no-install-recommends --allow-downgrades \ libpng16-16t64 libjpeg62-turbo libbrotli1 libwebp7 libfreetype6 \ libevent-2.1-7t64 libevent-core-2.1-7t64 libevent-extra-2.1-7t64 libevent-openssl-2.1-7t64 libevent-pthreads-2.1-7t64 \ diff --git a/php/franken-testing/Dockerfile b/php/franken-testing/Dockerfile index 204ea92..a0a06b7 100644 --- a/php/franken-testing/Dockerfile +++ b/php/franken-testing/Dockerfile @@ -123,6 +123,8 @@ COPY php/ini/opcache.no-jit.ini /usr/local/etc/php/conf.d/docker-php-ext-opca RUN \ set -eux \ && apt-get update \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get install -y --no-install-recommends --allow-downgrades \ libcap2-bin libstdc++6 \ && apt-get autoremove -y --purge \ diff --git a/php/franken/Dockerfile b/php/franken/Dockerfile index 19d0cbd..c21fe67 100644 --- a/php/franken/Dockerfile +++ b/php/franken/Dockerfile @@ -123,7 +123,8 @@ COPY php/ini/opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini RUN \ set -eux \ && apt-get update \ -&& apt-get upgrade -y \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get install -y --no-install-recommends --allow-downgrades \ libcap2-bin libstdc++6 \ && apt-get autoremove -y --purge \ diff --git a/php/testing/Dockerfile b/php/testing/Dockerfile index aa8b6c2..90df775 100644 --- a/php/testing/Dockerfile +++ b/php/testing/Dockerfile @@ -112,6 +112,8 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/ RUN \ set -eux \ && apt-get update \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get autoremove -y --purge \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \ && ldconfig \ diff --git a/php/zts-base/Dockerfile b/php/zts-base/Dockerfile index da0c691..a7debb5 100644 --- a/php/zts-base/Dockerfile +++ b/php/zts-base/Dockerfile @@ -188,6 +188,8 @@ COPY --from=builder /var/lib/php/ /var/lib/php/ RUN \ set -eux \ && apt-get update \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get install -y --no-install-recommends --allow-downgrades \ libxml2 libssl3t64 libsqlite3-0 libbz2-1.0 libidn2-0 \ zstd libbrotli1 libpsl5t64 libgsasl18 rtmpdump librtmp1 libnghttp3-9 nghttp2 \ diff --git a/php/zts-testing/Dockerfile b/php/zts-testing/Dockerfile index cb27db7..e01b1ef 100644 --- a/php/zts-testing/Dockerfile +++ b/php/zts-testing/Dockerfile @@ -110,6 +110,8 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/ RUN \ set -eux \ && apt-get update \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get autoremove -y --purge \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \ && ldconfig \ diff --git a/php/zts/Dockerfile b/php/zts/Dockerfile index 0a4e740..44526c8 100644 --- a/php/zts/Dockerfile +++ b/php/zts/Dockerfile @@ -145,7 +145,8 @@ COPY --from=builder /var/lib/php/ /var/lib/php/ RUN \ set -eux \ && apt-get update \ -&& apt-get upgrade -y \ +# dist-upgrade, not upgrade: sid transitions can need package adds/removals to move perl-base; plain upgrade holds it back and perl postinsts break on the skew +&& apt-get dist-upgrade -y --no-install-recommends \ && apt-get install -y --no-install-recommends --allow-downgrades \ libpng16-16t64 libjpeg62-turbo libbrotli1 libwebp7 libfreetype6 \ libevent-2.1-7t64 libevent-core-2.1-7t64 libevent-extra-2.1-7t64 libevent-openssl-2.1-7t64 libevent-pthreads-2.1-7t64 \