From e242b021724d28d4d99e6de2acc58e1d479f3859 Mon Sep 17 00:00:00 2001 From: Alexandre Quercia Date: Tue, 29 Nov 2022 16:27:30 +0100 Subject: [PATCH] fixup! Fix build of php53 docker-compose server --- .docker/php53/Dockerfile | 2 +- .docker/php54/Dockerfile | 4 ++-- .docker/php55_71/Dockerfile | 4 ++-- .docker/php72_73/Dockerfile | 2 +- .docker/php74_81/Dockerfile | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.docker/php53/Dockerfile b/.docker/php53/Dockerfile index ee2e26608..514c889d5 100644 --- a/.docker/php53/Dockerfile +++ b/.docker/php53/Dockerfile @@ -40,7 +40,7 @@ RUN set -eux; \ bison \ libbison-dev \ ; \ - apt-get purge -y --auto-remove \ + apt-get purge -y --force-yes --auto-remove \ autoconf2.13 \ ; \ rm -r /usr/src/php diff --git a/.docker/php54/Dockerfile b/.docker/php54/Dockerfile index ef5acfd0e..57c8ce526 100644 --- a/.docker/php54/Dockerfile +++ b/.docker/php54/Dockerfile @@ -19,14 +19,14 @@ RUN set -eux; \ libzip-dev \ '; \ apt-get update; \ - apt-get install -y --no-upgrade --no-install-recommends \ + apt-get install -y --force-yes --no-upgrade --no-install-recommends \ $buildDeps \ ; \ \ pecl install memcache-${MEMCACHE_VERSION}; \ docker-php-ext-enable memcache; \ \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \ + apt-get purge -y --force-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=true \ $buildDeps \ ; \ apt-get clean; \ diff --git a/.docker/php55_71/Dockerfile b/.docker/php55_71/Dockerfile index 1aa2171a3..b65ca92a3 100644 --- a/.docker/php55_71/Dockerfile +++ b/.docker/php55_71/Dockerfile @@ -25,14 +25,14 @@ RUN set -eux; \ libzip-dev \ '; \ apt-get update; \ - apt-get install -y --no-upgrade --no-install-recommends \ + apt-get install -y --force-yes --no-upgrade --no-install-recommends \ $buildDeps \ ; \ \ pecl install memcache-${MEMCACHE_VERSION}; \ docker-php-ext-enable memcache; \ \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \ + apt-get purge -y --force-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=true \ $buildDeps \ ; \ apt-get clean; \ diff --git a/.docker/php72_73/Dockerfile b/.docker/php72_73/Dockerfile index 69353468b..131efd858 100644 --- a/.docker/php72_73/Dockerfile +++ b/.docker/php72_73/Dockerfile @@ -25,7 +25,7 @@ RUN set -eux; \ libzip-dev \ '; \ apt-get update; \ - apt-get install -y --no-upgrade --no-install-recommends \ + apt-get install -y --force-yes --no-upgrade --no-install-recommends \ $buildDeps \ ; \ \ diff --git a/.docker/php74_81/Dockerfile b/.docker/php74_81/Dockerfile index a9d410dbf..3b4ec5f3f 100644 --- a/.docker/php74_81/Dockerfile +++ b/.docker/php74_81/Dockerfile @@ -8,7 +8,7 @@ RUN docker-php-ext-install pdo_mysql # RUN set -eux; \ apt-get update; \ - apt-get install -y --no-upgrade --no-install-recommends \ + apt-get install -y --force-yes --no-upgrade --no-install-recommends \ libonig-dev \ ; \ \ @@ -37,14 +37,14 @@ RUN set -eux; \ libzip-dev \ '; \ apt-get update; \ - apt-get install -y --no-upgrade --no-install-recommends \ + apt-get install -y --force-yes --no-upgrade --no-install-recommends \ $buildDeps \ ; \ \ pecl install memcache-${MEMCACHE_VERSION}; \ docker-php-ext-enable memcache; \ \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=true \ + apt-get purge -y --force-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=true \ $buildDeps \ ; \ apt-get clean; \