From 12c46d51bad323bc7636592e7aa046b4acea6a55 Mon Sep 17 00:00:00 2001 From: Alexandre Quercia Date: Tue, 29 Nov 2022 15:38:49 +0100 Subject: [PATCH] Fix docker images build to handle old linux distributions --- .docker/php53/Dockerfile | 16 +++++++++++++--- .docker/php54/Dockerfile | 11 +++++++++-- .docker/php55_71/Dockerfile | 11 +++++++++-- .docker/php72_73/Dockerfile | 2 +- .docker/php74_82/Dockerfile | 6 +++--- test/bin/test | 4 +--- 6 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.docker/php53/Dockerfile b/.docker/php53/Dockerfile index 99ca06bf0..004f740e0 100644 --- a/.docker/php53/Dockerfile +++ b/.docker/php53/Dockerfile @@ -2,11 +2,19 @@ FROM buildpack-deps:jessie ENV PHP_VERSION 5.3.29 +RUN set -eux; \ + codename='jessie'; \ + { \ + echo "deb http://archive.debian.org/debian ${codename} main"; \ + echo "deb http://archive.debian.org/debian ${codename}-backports main"; \ + echo "deb http://archive.debian.org/debian-security ${codename}/updates main"; \ + } > /etc/apt/sources.list; + # php 5.3 needs older autoconf RUN set -eux; \ \ apt-get update; \ - apt-get install -y \ + apt-get install -y --force-yes \ curl \ autoconf2.13 \ ; \ @@ -18,7 +26,7 @@ RUN set -eux; \ dpkg -i bison_2.7.1.dfsg-1_amd64.deb; \ rm *.deb; \ \ - curl -sSLf "https://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2; \ + curl --insecure -sSLf "https://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2; \ echo 'c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 php.tar.bz2' | sha256sum -cw --status; \ \ mkdir -p /usr/src/php; \ @@ -32,6 +40,8 @@ RUN set -eux; \ --with-pdo-mysql \ --with-zlib \ --enable-mbstring \ + --with-openssl=/usr \ + --with-libdir=lib/x86_64-linux-gnu \ ; \ make -j"$(nproc)"; \ make install; \ @@ -40,7 +50,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..3b4d0b3bb 100644 --- a/.docker/php54/Dockerfile +++ b/.docker/php54/Dockerfile @@ -1,5 +1,12 @@ FROM php:5.4-cli +RUN set -eux; \ + codename='jessie'; \ + { \ + echo "deb http://archive.debian.org/debian ${codename} main"; \ + echo "deb http://archive.debian.org/debian-security ${codename}/updates main"; \ + } > /etc/apt/sources.list; + RUN docker-php-ext-install pdo RUN docker-php-ext-install pdo_mysql RUN docker-php-ext-install mbstring @@ -19,14 +26,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..1aee036de 100644 --- a/.docker/php55_71/Dockerfile +++ b/.docker/php55_71/Dockerfile @@ -1,6 +1,13 @@ ARG PHP_TAG FROM php:${PHP_TAG} +RUN set -eux; \ + codename='jessie'; \ + { \ + echo "deb http://archive.debian.org/debian ${codename} main"; \ + echo "deb http://archive.debian.org/debian-security ${codename}/updates main"; \ + } > /etc/apt/sources.list; + RUN docker-php-ext-install pdo RUN docker-php-ext-install pdo_mysql RUN docker-php-ext-install mbstring @@ -25,14 +32,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_82/Dockerfile b/.docker/php74_82/Dockerfile index a9d410dbf..3b4ec5f3f 100644 --- a/.docker/php74_82/Dockerfile +++ b/.docker/php74_82/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; \ diff --git a/test/bin/test b/test/bin/test index 5305c0541..271937a5e 100755 --- a/test/bin/test +++ b/test/bin/test @@ -12,7 +12,6 @@ # Configuration # dependencyPreferences='highest' -skipPHPVersions='php8' # Commands # @@ -54,8 +53,7 @@ fetchAllPHPVersions () { docker-compose 2>/dev/null ps --services --filter status=running \ | grep php \ - | sort \ - | grep -v ${skipPHPVersions} + | sort } install_highest ()