Skip to content

Commit f0c625d

Browse files
cytopiacytopia
authored
Merge pull request #188 from devilbox/release-0.121
Release 0.121
2 parents 7c1ceab + a0332b9 commit f0c625d

File tree

10 files changed

+171
-68
lines changed

10 files changed

+171
-68
lines changed

‎.github/workflows/php-nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- '8.1'
8383
refs:
8484
- 'master'
85-
- '0.118'
85+
- '0.121'
8686
steps:
8787

8888
# ------------------------------------------------------------

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
## Unreleased
55

66

7+
## Release 0.121
8+
9+
#### Fixed
10+
- Fixed `msgpack` install for PHP 7.0 - 7.4
11+
12+
#### Changed
13+
- Compile `redis` extension with `msgpack` and `igbinary`
14+
15+
716
## Release 0.120
817

918
#### Fixed

‎Dockerfiles/mods/Dockerfile-7.0

+22-5
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ RUN set -eux \
314314

315315
# -------------------- Installing PHP Extension: memcache --------------------
316316
RUN set -eux \
317-
# Installation: Generic
317+
# Installation: Version specific
318318
# Type: PECL extension
319319
# Default: Pecl command
320-
&& pecl install memcache \
320+
&& pecl install memcache-4.0.5.2 \
321321
# Enabling
322322
&& docker-php-ext-enable memcache \
323323
&& true
@@ -537,9 +537,26 @@ RUN set -eux \
537537
# -------------------- Installing PHP Extension: redis --------------------
538538
RUN set -eux \
539539
# Installation: Generic
540-
# Type: PECL extension
541-
# Default: Pecl command
542-
&& pecl install redis \
540+
# Type: GIT extension
541+
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
542+
&& cd /tmp/redis \
543+
# Custom: Branch
544+
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
545+
# Custom: Install command
546+
&& REDIS_ARGS=""; \
547+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
548+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
549+
fi; \
550+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
551+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
552+
fi; \
553+
phpize \
554+
&& ./configure --enable-redis ${REDIS_ARGS} \
555+
&& make -j$(getconf _NPROCESSORS_ONLN) \
556+
&& make install \
557+
&& rm -rf /usr/local/include/php/ext/igbinary \
558+
&& rm -rf /usr/local/include/php/ext/msgpack \
559+
\
543560
# Enabling
544561
&& docker-php-ext-enable redis \
545562
&& true

‎Dockerfiles/mods/Dockerfile-7.1

+22-5
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ RUN set -eux \
314314

315315
# -------------------- Installing PHP Extension: memcache --------------------
316316
RUN set -eux \
317-
# Installation: Generic
317+
# Installation: Version specific
318318
# Type: PECL extension
319319
# Default: Pecl command
320-
&& pecl install memcache \
320+
&& pecl install memcache-4.0.5.2 \
321321
# Enabling
322322
&& docker-php-ext-enable memcache \
323323
&& true
@@ -537,9 +537,26 @@ RUN set -eux \
537537
# -------------------- Installing PHP Extension: redis --------------------
538538
RUN set -eux \
539539
# Installation: Generic
540-
# Type: PECL extension
541-
# Default: Pecl command
542-
&& pecl install redis \
540+
# Type: GIT extension
541+
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
542+
&& cd /tmp/redis \
543+
# Custom: Branch
544+
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
545+
# Custom: Install command
546+
&& REDIS_ARGS=""; \
547+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
548+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
549+
fi; \
550+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
551+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
552+
fi; \
553+
phpize \
554+
&& ./configure --enable-redis ${REDIS_ARGS} \
555+
&& make -j$(getconf _NPROCESSORS_ONLN) \
556+
&& make install \
557+
&& rm -rf /usr/local/include/php/ext/igbinary \
558+
&& rm -rf /usr/local/include/php/ext/msgpack \
559+
\
543560
# Enabling
544561
&& docker-php-ext-enable redis \
545562
&& true

‎Dockerfiles/mods/Dockerfile-7.2

+22-5
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,10 @@ RUN set -eux \
317317

318318
# -------------------- Installing PHP Extension: memcache --------------------
319319
RUN set -eux \
320-
# Installation: Generic
320+
# Installation: Version specific
321321
# Type: PECL extension
322322
# Default: Pecl command
323-
&& pecl install memcache \
323+
&& pecl install memcache-4.0.5.2 \
324324
# Enabling
325325
&& docker-php-ext-enable memcache \
326326
&& true
@@ -541,9 +541,26 @@ RUN set -eux \
541541
# -------------------- Installing PHP Extension: redis --------------------
542542
RUN set -eux \
543543
# Installation: Generic
544-
# Type: PECL extension
545-
# Default: Pecl command
546-
&& pecl install redis \
544+
# Type: GIT extension
545+
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
546+
&& cd /tmp/redis \
547+
# Custom: Branch
548+
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
549+
# Custom: Install command
550+
&& REDIS_ARGS=""; \
551+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
552+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
553+
fi; \
554+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
555+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
556+
fi; \
557+
phpize \
558+
&& ./configure --enable-redis ${REDIS_ARGS} \
559+
&& make -j$(getconf _NPROCESSORS_ONLN) \
560+
&& make install \
561+
&& rm -rf /usr/local/include/php/ext/igbinary \
562+
&& rm -rf /usr/local/include/php/ext/msgpack \
563+
\
547564
# Enabling
548565
&& docker-php-ext-enable redis \
549566
&& true

‎Dockerfiles/mods/Dockerfile-7.3

+22-5
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,10 @@ RUN set -eux \
317317

318318
# -------------------- Installing PHP Extension: memcache --------------------
319319
RUN set -eux \
320-
# Installation: Generic
320+
# Installation: Version specific
321321
# Type: PECL extension
322322
# Default: Pecl command
323-
&& pecl install memcache \
323+
&& pecl install memcache-4.0.5.2 \
324324
# Enabling
325325
&& docker-php-ext-enable memcache \
326326
&& true
@@ -541,9 +541,26 @@ RUN set -eux \
541541
# -------------------- Installing PHP Extension: redis --------------------
542542
RUN set -eux \
543543
# Installation: Generic
544-
# Type: PECL extension
545-
# Default: Pecl command
546-
&& pecl install redis \
544+
# Type: GIT extension
545+
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
546+
&& cd /tmp/redis \
547+
# Custom: Branch
548+
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
549+
# Custom: Install command
550+
&& REDIS_ARGS=""; \
551+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
552+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
553+
fi; \
554+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
555+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
556+
fi; \
557+
phpize \
558+
&& ./configure --enable-redis ${REDIS_ARGS} \
559+
&& make -j$(getconf _NPROCESSORS_ONLN) \
560+
&& make install \
561+
&& rm -rf /usr/local/include/php/ext/igbinary \
562+
&& rm -rf /usr/local/include/php/ext/msgpack \
563+
\
547564
# Enabling
548565
&& docker-php-ext-enable redis \
549566
&& true

‎Dockerfiles/mods/Dockerfile-7.4

+22-5
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ RUN set -eux \
326326

327327
# -------------------- Installing PHP Extension: memcache --------------------
328328
RUN set -eux \
329-
# Installation: Generic
329+
# Installation: Version specific
330330
# Type: PECL extension
331331
# Default: Pecl command
332-
&& pecl install memcache \
332+
&& pecl install memcache-4.0.5.2 \
333333
# Enabling
334334
&& docker-php-ext-enable memcache \
335335
&& true
@@ -535,9 +535,26 @@ RUN set -eux \
535535
# -------------------- Installing PHP Extension: redis --------------------
536536
RUN set -eux \
537537
# Installation: Generic
538-
# Type: PECL extension
539-
# Default: Pecl command
540-
&& pecl install redis \
538+
# Type: GIT extension
539+
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
540+
&& cd /tmp/redis \
541+
# Custom: Branch
542+
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
543+
# Custom: Install command
544+
&& REDIS_ARGS=""; \
545+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
546+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
547+
fi; \
548+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
549+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
550+
fi; \
551+
phpize \
552+
&& ./configure --enable-redis ${REDIS_ARGS} \
553+
&& make -j$(getconf _NPROCESSORS_ONLN) \
554+
&& make install \
555+
&& rm -rf /usr/local/include/php/ext/igbinary \
556+
&& rm -rf /usr/local/include/php/ext/msgpack \
557+
\
541558
# Enabling
542559
&& docker-php-ext-enable redis \
543560
&& true

‎Dockerfiles/mods/Dockerfile-8.0

+12-8
Original file line numberDiff line numberDiff line change
@@ -333,22 +333,26 @@ RUN set -eux \
333333

334334
# -------------------- Installing PHP Extension: redis --------------------
335335
RUN set -eux \
336-
# Installation: Version specific
336+
# Installation: Generic
337337
# Type: GIT extension
338338
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
339339
&& cd /tmp/redis \
340340
# Custom: Branch
341341
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
342342
# Custom: Install command
343-
&& sed -i'' 's/, ZSTR_LEN(ra->algorithm)//g' redis_array_impl.c \
344-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' library.c \
345-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' redis_array_impl.c \
346-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' cluster_library.c \
347-
&& sed -i'' 's|.*->no_separation.*||g' redis_array_impl.c \
348-
&& phpize \
349-
&& ./configure --enable-redis \
343+
&& REDIS_ARGS=""; \
344+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
345+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
346+
fi; \
347+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
348+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
349+
fi; \
350+
phpize \
351+
&& ./configure --enable-redis ${REDIS_ARGS} \
350352
&& make -j$(getconf _NPROCESSORS_ONLN) \
351353
&& make install \
354+
&& rm -rf /usr/local/include/php/ext/igbinary \
355+
&& rm -rf /usr/local/include/php/ext/msgpack \
352356
\
353357
# Enabling
354358
&& docker-php-ext-enable redis \

‎Dockerfiles/mods/Dockerfile-8.1

+12-8
Original file line numberDiff line numberDiff line change
@@ -333,22 +333,26 @@ RUN set -eux \
333333

334334
# -------------------- Installing PHP Extension: redis --------------------
335335
RUN set -eux \
336-
# Installation: Version specific
336+
# Installation: Generic
337337
# Type: GIT extension
338338
&& git clone https://github.com/phpredis/phpredis /tmp/redis \
339339
&& cd /tmp/redis \
340340
# Custom: Branch
341341
&& git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \
342342
# Custom: Install command
343-
&& sed -i'' 's/, ZSTR_LEN(ra->algorithm)//g' redis_array_impl.c \
344-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' library.c \
345-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' redis_array_impl.c \
346-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' cluster_library.c \
347-
&& sed -i'' 's|.*->no_separation.*||g' redis_array_impl.c \
348-
&& phpize \
349-
&& ./configure --enable-redis \
343+
&& REDIS_ARGS=""; \
344+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
345+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
346+
fi; \
347+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
348+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
349+
fi; \
350+
phpize \
351+
&& ./configure --enable-redis ${REDIS_ARGS} \
350352
&& make -j$(getconf _NPROCESSORS_ONLN) \
351353
&& make install \
354+
&& rm -rf /usr/local/include/php/ext/igbinary \
355+
&& rm -rf /usr/local/include/php/ext/msgpack \
352356
\
353357
# Enabling
354358
&& docker-php-ext-enable redis \

‎build/ansible/group_vars/all/mods.yml

+27-26
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,21 @@ extensions_available:
471471
5.6:
472472
type: pecl
473473
version: 2.2.7
474+
7.0:
475+
type: pecl
476+
version: 4.0.5.2
477+
7.1:
478+
type: pecl
479+
version: 4.0.5.2
480+
7.2:
481+
type: pecl
482+
version: 4.0.5.2
483+
7.3:
484+
type: pecl
485+
version: 4.0.5.2
486+
7.4:
487+
type: pecl
488+
version: 4.0.5.2
474489
all:
475490
type: pecl
476491
build_dep: [zlib1g-dev]
@@ -841,38 +856,24 @@ extensions_available:
841856
5.6:
842857
type: pecl
843858
version: 4.3.0
844-
8.0:
845-
type: git
846-
git_url: https://github.com/phpredis/phpredis
847-
git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
848-
# TODO: This is a nasty work-around to fix current phpredis implementation for PHP 8.0
849-
command: |
850-
sed -i'' 's/, ZSTR_LEN(ra->algorithm)//g' redis_array_impl.c \
851-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' library.c \
852-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' redis_array_impl.c \
853-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' cluster_library.c \
854-
&& sed -i'' 's|.*->no_separation.*||g' redis_array_impl.c \
855-
&& phpize \
856-
&& ./configure --enable-redis \
857-
&& make -j$(getconf _NPROCESSORS_ONLN) \
858-
&& make install \
859-
8.1:
859+
all:
860860
type: git
861861
git_url: https://github.com/phpredis/phpredis
862862
git_ref: $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1)
863-
# TODO: This is a nasty work-around to fix current phpredis implementation for PHP 8.1
864863
command: |
865-
sed -i'' 's/, ZSTR_LEN(ra->algorithm)//g' redis_array_impl.c \
866-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' library.c \
867-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' redis_array_impl.c \
868-
&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' cluster_library.c \
869-
&& sed -i'' 's|.*->no_separation.*||g' redis_array_impl.c \
870-
&& phpize \
871-
&& ./configure --enable-redis \
864+
REDIS_ARGS=""; \
865+
if [ -d "/usr/local/include/php/ext/igbinary" ]; then \
866+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-igbinary"; \
867+
fi; \
868+
if [ -d "/usr/local/include/php/ext/msgpack" ]; then \
869+
REDIS_ARGS="${REDIS_ARGS} --enable-redis-msgpack"; \
870+
fi; \
871+
phpize \
872+
&& ./configure --enable-redis ${REDIS_ARGS} \
872873
&& make -j$(getconf _NPROCESSORS_ONLN) \
873874
&& make install \
874-
all:
875-
type: pecl
875+
&& rm -rf /usr/local/include/php/ext/igbinary \
876+
&& rm -rf /usr/local/include/php/ext/msgpack \
876877
reflection:
877878
already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
878879
rdkafka:

0 commit comments

Comments
 (0)