From 697702b6128adbed7bb1db26df8eecb3b8ebceee Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 11 Dec 2021 00:18:52 +0100 Subject: [PATCH] Switch to PHPUnit 9 & remove php7.1/7.2 images --- php7.1/Dockerfile | 20 -------------------- php7.1/php.ini | 10 ---------- php7.2/Dockerfile | 20 -------------------- php7.2/php.ini | 10 ---------- php7.3/Dockerfile | 6 +++--- php7.4/Dockerfile | 6 +++--- php8.0/Dockerfile | 6 +++--- 7 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 php7.1/Dockerfile delete mode 100644 php7.1/php.ini delete mode 100644 php7.2/Dockerfile delete mode 100644 php7.2/php.ini diff --git a/php7.1/Dockerfile b/php7.1/Dockerfile deleted file mode 100644 index 2cebc2c..0000000 --- a/php7.1/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM debian:jessie - -# install the PHP extensions we need -# see https://friendi.ca/resources/requirements/ -RUN set -ex; \ - apt-get update; \ - apt-get install -y wget gnupg2 libzip2 apt-transport-https lsb-release ca-certificates; \ - wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; \ - echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list; \ - apt-get update; \ - apt-get install -y php7.1-gd git curl openssl \ - php7.1-cli php7.1-curl php7.1-mcrypt php7.1-mysql wget make \ - php7.1-redis php7.1-memcached php7.1-memcache php7.1-json \ - php7.1-apcu php7.1-xdebug php7.1-xml php7.1-zip php7.1-dev php7.1-mbstring \ - ; \ - rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*; - -RUN phpenmod curl pdo pdo_mysql xml gd zip opcache mbstring posix ctype json iconv pcntl openssl -RUN phpdismod xdebug -ADD php.ini /etc/php/7.1/cli/conf.d/friendica.ini \ No newline at end of file diff --git a/php7.1/php.ini b/php7.1/php.ini deleted file mode 100644 index 97888e9..0000000 --- a/php7.1/php.ini +++ /dev/null @@ -1,10 +0,0 @@ -memory_limit = 768M -phar.readonly = 0 ; only for building phar files on CI - should be disabled on production environments -; Opcache -opcache.enable=1 -opcache.enable_cli=1 -opcache.interned_strings_buffer=8 -opcache.max_accelerated_files=10000 -opcache.memory_consumption=128 -opcache.save_comments=1 -opcache.revalidate_freq=1 \ No newline at end of file diff --git a/php7.2/Dockerfile b/php7.2/Dockerfile deleted file mode 100644 index 7025ca4..0000000 --- a/php7.2/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM debian:jessie - -# install the PHP extensions we need -# see https://friendi.ca/resources/requirements/ -RUN set -ex; \ - apt-get update; \ - apt-get install -y wget gnupg2 libzip2 apt-transport-https lsb-release ca-certificates; \ - wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg; \ - echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list; \ - apt-get update; \ - apt-get install -y php7.2-gd git curl openssl \ - php7.2-cli php7.2-curl php7.2-mysql wget make \ - php7.2-redis php7.2-memcached php7.2-memcache php7.2-json \ - php7.2-apcu php7.2-xdebug php7.2-xml php7.2-zip php7.2-dev php7.2-mbstring \ - ; \ - rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*; - -RUN phpenmod curl pdo pdo_mysql xml gd zip opcache mbstring posix ctype json iconv pcntl openssl -RUN phpdismod xdebug -ADD php.ini /etc/php/7.1/cli/conf.d/friendica.ini \ No newline at end of file diff --git a/php7.2/php.ini b/php7.2/php.ini deleted file mode 100644 index 97888e9..0000000 --- a/php7.2/php.ini +++ /dev/null @@ -1,10 +0,0 @@ -memory_limit = 768M -phar.readonly = 0 ; only for building phar files on CI - should be disabled on production environments -; Opcache -opcache.enable=1 -opcache.enable_cli=1 -opcache.interned_strings_buffer=8 -opcache.max_accelerated_files=10000 -opcache.memory_consumption=128 -opcache.save_comments=1 -opcache.revalidate_freq=1 \ No newline at end of file diff --git a/php7.3/Dockerfile b/php7.3/Dockerfile index 8c5be29..b2928f4 100644 --- a/php7.3/Dockerfile +++ b/php7.3/Dockerfile @@ -18,9 +18,9 @@ RUN set -ex; \ RUN phpenmod curl pdo pdo_mysql xml gd zip opcache mbstring posix ctype json iconv pcntl openssl RUN set -ex; \ - curl -O -L https://phar.phpunit.de/phpunit-8.phar; \ - chmod +x phpunit-8.phar; \ - mv phpunit-8.phar /usr/local/bin/phpunit; + curl -O -L https://phar.phpunit.de/phpunit-9.phar; \ + chmod +x phpunit-9.phar; \ + mv phpunit-9.phar /usr/local/bin/phpunit; RUN set -ex; \ curl -O -L https://getcomposer.org/download/1.6.2/composer.phar; \ chmod +x composer.phar; \ diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile index e183bc0..2741f8f 100644 --- a/php7.4/Dockerfile +++ b/php7.4/Dockerfile @@ -18,9 +18,9 @@ RUN set -ex; \ RUN phpenmod curl pdo pdo_mysql xml gd zip opcache mbstring posix ctype json iconv pcntl openssl RUN set -ex; \ - curl -O -L https://phar.phpunit.de/phpunit-8.phar; \ - chmod +x phpunit-8.phar; \ - mv phpunit-8.phar /usr/local/bin/phpunit; + curl -O -L https://phar.phpunit.de/phpunit-9.phar; \ + chmod +x phpunit-9.phar; \ + mv phpunit-9.phar /usr/local/bin/phpunit; RUN set -ex; \ curl -O -L https://getcomposer.org/download/1.6.2/composer.phar; \ chmod +x composer.phar; \ diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile index f5f8b16..721ddd4 100644 --- a/php8.0/Dockerfile +++ b/php8.0/Dockerfile @@ -18,9 +18,9 @@ RUN set -ex; \ RUN phpenmod curl pdo pdo_mysql xml gd zip opcache mbstring posix ctype iconv pcntl openssl RUN set -ex; \ - curl -O -L https://phar.phpunit.de/phpunit-8.phar; \ - chmod +x phpunit-8.phar; \ - mv phpunit-8.phar /usr/local/bin/phpunit; + curl -O -L https://phar.phpunit.de/phpunit-9.phar; \ + chmod +x phpunit-9.phar; \ + mv phpunit-9.phar /usr/local/bin/phpunit; RUN set -ex; \ curl -O -L https://getcomposer.org/download/1.10.15/composer.phar; \ chmod +x composer.phar; \