Reconcile master with 8.0-buster

and set PHP 7.2 EOL

Author: stronk7

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-apache-buster
+FROM php:8.0-apache-buster
 
 ADD root/ /
 # Fix the original permissions of /tmp, the PHP default upload tmp dir.
@@ -9,6 +9,20 @@ RUN apt-get update && apt-get install -y \
     git \
 && rm -rf /var/lib/apt/lists/*
 
+# Install pickle as an easier alternative to PECL, that is not
+# available any more for PHP 8 and up. Some alternatives searched were:
+#  - https://olvlvl.com/2019-06-docker-pecl-without-pecl
+#  - https://github.com/FriendsOfPHP/pickle
+#  - manually "curl https://pecl.php.net/get/xxxx && tar && docker-php-ext-install xxx"
+# Of course, if the images end using some alternative, we'll switch to it. Just right now
+# there isn't such an alternative.a
+#
+# Update 20201126: Finally, see https://github.com/docker-library/php/issues/1087 it seems that pear/pecl
+# continues being availbale with php8, so we are going to continue using it. The previous comments as
+# left in case we need to find an alternative way to install PECL stuff and there isn't any official.
+# For an example of php80-rc5 near complete, using pickle instead of pear/pecl, look to:
+# https://github.com/stronk7/moodle-php-apache/tree/8.0-buster-pickle-version
+
 # Setup the required extensions.
 ARG DEBIAN_FRONTEND=noninteractive
 RUN /tmp/setup/php-extensions.sh

README.md

@@ -6,12 +6,13 @@ A Moodle PHP environment configured for Moodle development based on [Official PH
 
 | PHP Version  | Variant | Tags             | Status | Notes |
 |--------------|---------|------------------|--------|-------|
+| PHP 8.0      | Buster  | 8.0, 8.0-buster  | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=8.0-buster)](https://travis-ci.com/moodlehq/moodle-php-apache)|
 | PHP 7.4      | Buster  | 7.4, 7.4-buster  | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.4-buster)](https://travis-ci.com/moodlehq/moodle-php-apache)|
 | PHP 7.3      | Buster  | 7.3, 7.3-buster  | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.3-buster)](https://travis-ci.com/moodlehq/moodle-php-apache)|
-| PHP 7.2      | Buster  | 7.2, 7.2-buster  | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.2-buster)](https://travis-ci.com/moodlehq/moodle-php-apache)|
+| PHP 7.2      | Buster  | 7.2, 7.2-buster  | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.2-buster)](https://travis-ci.com/moodlehq/moodle-php-apache)|PHP 7.2 EOL|
 | PHP 7.1      | Buster  | 7.1, 7.1-buster  | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.1-buster)](https://travis-ci.com/moodlehq/moodle-php-apache)|PHP 7.1 EOL|
 | PHP 7.3      | Stretch | 7.3-stretch      | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.3-stretch)](https://travis-ci.com/moodlehq/moodle-php-apache)|Stretch EOL|
-| PHP 7.2      | Stretch | 7.2-stretch      | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.2-stretch)](https://travis-ci.com/moodlehq/moodle-php-apache)|Stretch EOL|
+| PHP 7.2      | Stretch | 7.2-stretch      | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.2-stretch)](https://travis-ci.com/moodlehq/moodle-php-apache)|Stretch and PHP 7.2 EOL|
 | PHP 7.1      | Stretch | 7.1-stretch      | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.1-stretch)](https://travis-ci.com/moodlehq/moodle-php-apache)|Stretch and PHP 7.1 EOL|
 | PHP 7.0      | Stretch | 7.0, 7.0-stretch | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=7.0-stretch)](https://travis-ci.com/moodlehq/moodle-php-apache)|Stretch and PHP 7.0 EOL|
 | PHP 5.6      | Stretch | 5.6, 5.6-stretch | [![Build Status](https://travis-ci.com/moodlehq/moodle-php-apache.svg?branch=5.6-stretch)](https://travis-ci.com/moodlehq/moodle-php-apache)|Stretch and PHP 5.6 EOL|

root/tmp/setup/oci8-extension.sh

@@ -20,5 +20,6 @@ rm /tmp/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip
 ln -s /usr/local/instantclient_19_6 /usr/local/instantclient
 ln -s /usr/local/instantclient/sqlplus /usr/bin/sqlplus
 
-echo 'instantclient,/usr/local/instantclient' | pecl install oci8 && docker-php-ext-enable oci8
+echo 'instantclient,/usr/local/instantclient' | pecl install oci8
+docker-php-ext-enable oci8
 echo 'oci8.statement_cache_size = 0' >> /usr/local/etc/php/conf.d/docker-php-ext-oci8.ini

root/tmp/setup/php-extensions.sh

@@ -41,14 +41,18 @@ echo 'en_AU.UTF-8 UTF-8' >> /etc/locale.gen
 locale-gen
 
 echo "Installing php extensions"
+
+# ZIP
+docker-php-ext-configure zip --with-zip
+docker-php-ext-install zip
+
 docker-php-ext-install -j$(nproc) \
     intl \
     mysqli \
     opcache \
     pgsql \
     soap \
-    xsl \
-    xmlrpc
+    xsl
 
 # GD.
 docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
@@ -58,13 +62,14 @@ docker-php-ext-install -j$(nproc) gd
 docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
 docker-php-ext-install -j$(nproc) ldap
 
-# Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid
+# Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid.
 pecl install memcached mongodb redis apcu igbinary solr uuid
 docker-php-ext-enable memcached mongodb redis apcu igbinary solr uuid
 
-# ZIP
-docker-php-ext-configure zip --with-zip
-docker-php-ext-install zip
+# xmlrpc -- not existing as of 8.0.0 release (not yet @ PECL, https://php.watch/versions/  8.0#xmlrpc)
+# (once available add it to the previous pecl command)
+#pecl install xmlrpc
+#docker-php-ext-enable xmlrpc
 
 echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
 

root/tmp/setup/sqlsrv-extension.sh

@@ -15,6 +15,6 @@ ACCEPT_EULA=Y apt-get install -y msodbcsql17
 
 ln -fsv /opt/mssql-tools/bin/* /usr/bin
 
-# Need 5.7.0preview (or later) for PHP 7.4 support
-pecl install sqlsrv-5.8.1
+# Need 5.9.0preview1 (or later) for PHP 8.0 support
+pecl install sqlsrv-5.9.0preview1
 docker-php-ext-enable sqlsrv

tests/fixtures/test.php

@@ -12,11 +12,12 @@
     'oci8',
     'pgsql',
     'redis',
-    'solr',
     'soap',
+    'sodium',
+    'solr',
     'sqlsrv',
     'xsl',
-    'xmlrpc',
+    // 'xmlrpc', -- not existing as of 8.0.0 release (not yet @ PECL, https://php.watch/versions/8.0#xmlrpc)
     'zip',
     'uuid'
 ];