Skip to content

Commit 8318b43

Browse files
committed
Ensure to check against mhash module
1 parent 6a00f19 commit 8318b43

6 files changed

Lines changed: 14 additions & 0 deletions

File tree

Dockerfiles/mods/Dockerfile-5.2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,8 @@ RUN set -eux \
708708
&& php-fpm -m | grep -oiE '^memcache$' \
709709
&& php -m | grep -oiE '^memcached$' \
710710
&& php-fpm -m | grep -oiE '^memcached$' \
711+
&& php -m | grep -oiE '^mhash$' \
712+
&& php-fpm -m | grep -oiE '^mhash$' \
711713
&& php -m | grep -oiE '^mongo$' \
712714
&& php-fpm -m | grep -oiE '^mongo$' \
713715
&& php -m | grep -oiE '^mysql$' \

Dockerfiles/mods/Dockerfile-5.3

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,8 @@ RUN set -eux \
835835
&& php-fpm -m | grep -oiE '^memcache$' \
836836
&& php -m | grep -oiE '^memcached$' \
837837
&& php-fpm -m | grep -oiE '^memcached$' \
838+
&& php -m | grep -oiE '^mhash$' \
839+
&& php-fpm -m | grep -oiE '^mhash$' \
838840
&& php -m | grep -oiE '^mongo$' \
839841
&& php-fpm -m | grep -oiE '^mongo$' \
840842
&& php -m | grep -oiE '^mongodb$' \

Dockerfiles/mods/Dockerfile-5.4

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,8 @@ RUN set -eux \
846846
&& php-fpm -m | grep -oiE '^memcache$' \
847847
&& php -m | grep -oiE '^memcached$' \
848848
&& php-fpm -m | grep -oiE '^memcached$' \
849+
&& php -m | grep -oiE '^mhash$' \
850+
&& php-fpm -m | grep -oiE '^mhash$' \
849851
&& php -m | grep -oiE '^mongo$' \
850852
&& php-fpm -m | grep -oiE '^mongo$' \
851853
&& php -m | grep -oiE '^mongodb$' \

Dockerfiles/mods/Dockerfile-5.5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,8 @@ RUN set -eux \
899899
&& php-fpm -m | grep -oiE '^memcache$' \
900900
&& php -m | grep -oiE '^memcached$' \
901901
&& php-fpm -m | grep -oiE '^memcached$' \
902+
&& php -m | grep -oiE '^mhash$' \
903+
&& php-fpm -m | grep -oiE '^mhash$' \
902904
&& php -m | grep -oiE '^mongo$' \
903905
&& php-fpm -m | grep -oiE '^mongo$' \
904906
&& php -m | grep -oiE '^mongodb$' \

Dockerfiles/mods/Dockerfile-5.6

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,8 @@ RUN set -eux \
918918
&& php-fpm -m | grep -oiE '^memcache$' \
919919
&& php -m | grep -oiE '^memcached$' \
920920
&& php-fpm -m | grep -oiE '^memcached$' \
921+
&& php -m | grep -oiE '^mhash$' \
922+
&& php-fpm -m | grep -oiE '^mhash$' \
921923
&& php -m | grep -oiE '^mongo$' \
922924
&& php-fpm -m | grep -oiE '^mongo$' \
923925
&& php -m | grep -oiE '^mongodb$' \

build/ansible/group_vars/all/mods.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ extensions_enabled:
4949
- memcache
5050
# requires igbinary and msgpack to be installed
5151
- memcached
52+
- mhash
5253
- mongo
5354
- mongodb
5455
- mysql
@@ -605,6 +606,9 @@ extensions_available:
605606
type: pecl
606607
build_dep: [zlib1g-dev, libmemcached-dev, libevent-dev]
607608
run_dep: [libmemcachedutil2]
609+
mhash:
610+
disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated
611+
already_avail: [5.2, 5.3, 5.4, 5.5, 5.6]
608612
mongo:
609613
disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] # Deprecated
610614
5.2:

0 commit comments

Comments
 (0)