Skip to content

Commit 67a8d11

Browse files
committed
Reconcile master with 8.0-buster
1 parent c555cdd commit 67a8d11

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.0-apache-buster
1+
FROM php:8.0.1-apache-buster
22

33
ADD root/ /
44
# Fix the original permissions of /tmp, the PHP default upload tmp dir.

root/tmp/setup/php-extensions.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,9 @@ docker-php-ext-install -j$(nproc) gd
6262
docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/
6363
docker-php-ext-install -j$(nproc) ldap
6464

65-
# Memcached, MongoDB, Redis, APCu, igbinary, solr, uuid.
66-
pecl install memcached mongodb redis apcu igbinary solr uuid
67-
docker-php-ext-enable memcached mongodb redis apcu igbinary solr uuid
68-
69-
# xmlrpc -- not existing as of 8.0.0 release (not yet @ PECL, https://php.watch/versions/ 8.0#xmlrpc)
70-
# (once available add it to the previous pecl command)
71-
#pecl install xmlrpc
72-
#docker-php-ext-enable xmlrpc
65+
# APCu, igbinary, Memcached, MongoDB, Redis, Solr, uuid, XMLRPC (beta)
66+
pecl install apcu igbinary memcached mongodb redis solr uuid xmlrpc-beta
67+
docker-php-ext-enable apcu igbinary memcached mongodb redis solr uuid xmlrpc
7368

7469
echo 'apc.enable_cli = On' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini
7570

tests/fixtures/test.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
'sodium',
1717
'solr',
1818
'sqlsrv',
19+
'uuid',
1920
'xsl',
20-
// 'xmlrpc', -- not existing as of 8.0.0 release (not yet @ PECL, https://php.watch/versions/8.0#xmlrpc)
21+
'xmlrpc',
2122
'zip',
22-
'uuid'
2323
];
2424

2525
$buffer = '';;

0 commit comments

Comments
 (0)