Skip to content

Commit 554e979

Browse files
cytopiacytopia
authored
Merge pull request #101 from devilbox/release-0.77
Fix igbinary for PHP 5.3, 5.4, 5.5 and 5.6
2 parents 481d095 + ceabd15 commit 554e979

9 files changed

Lines changed: 30 additions & 12 deletions

File tree

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ RUN set -x \
176176
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
177177
\
178178
# ---- Installing PHP Extension: igbinary ----
179-
&& pecl install igbinary \
179+
&& pecl install igbinary-2.0.8 \
180180
&& docker-php-ext-enable igbinary \
181181
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
182182
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ RUN set -x \
176176
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
177177
\
178178
# ---- Installing PHP Extension: igbinary ----
179-
&& pecl install igbinary \
179+
&& pecl install igbinary-2.0.8 \
180180
&& docker-php-ext-enable igbinary \
181181
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
182182
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ RUN set -x \
171171
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
172172
\
173173
# ---- Installing PHP Extension: igbinary ----
174-
&& pecl install igbinary \
174+
&& pecl install igbinary-2.0.8 \
175175
&& docker-php-ext-enable igbinary \
176176
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
177177
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ RUN set -x \
186186
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
187187
\
188188
# ---- Installing PHP Extension: igbinary ----
189-
&& pecl install igbinary \
189+
&& pecl install igbinary-2.0.8 \
190190
&& docker-php-ext-enable igbinary \
191191
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
192192
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ RUN set -x \
236236
# ---- Installing PHP Extension: memcache ----
237237
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
238238
&& cd /tmp/memcache \
239+
&& git checkout origin/php7 \
239240
&& phpize \
240241
&& ./configure --with-zlib-dir=/usr \
241242
&& make -j$(getconf _NPROCESSORS_ONLN) \
@@ -328,7 +329,7 @@ RUN set -x \
328329
&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
329330
\
330331
# ---- Installing PHP Extension: pdo_sqlsrv ----
331-
&& pecl install pdo_sqlsrv \
332+
&& pecl install pdo_sqlsrv-5.3.0 \
332333
&& docker-php-ext-enable pdo_sqlsrv \
333334
&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
334335
&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
@@ -392,7 +393,7 @@ RUN set -x \
392393
&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
393394
\
394395
# ---- Installing PHP Extension: sqlsrv ----
395-
&& pecl install sqlsrv \
396+
&& pecl install sqlsrv-5.3.0 \
396397
&& docker-php-ext-enable sqlsrv \
397398
&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
398399
&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ RUN set -x \
236236
# ---- Installing PHP Extension: memcache ----
237237
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
238238
&& cd /tmp/memcache \
239+
&& git checkout origin/php7 \
239240
&& phpize \
240241
&& ./configure --with-zlib-dir=/usr \
241242
&& make -j$(getconf _NPROCESSORS_ONLN) \

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ RUN set -x \
237237
# ---- Installing PHP Extension: memcache ----
238238
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
239239
&& cd /tmp/memcache \
240+
&& git checkout origin/php7 \
240241
&& phpize \
241242
&& ./configure --with-zlib-dir=/usr \
242243
&& make -j$(getconf _NPROCESSORS_ONLN) \

‎Dockerfiles/mods/Dockerfile-7.3‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ RUN set -x \
299299
&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
300300
\
301301
# ---- Installing PHP Extension: pdo_sqlsrv ----
302-
&& pecl install pdo_sqlsrv-5.5.0preview \
302+
&& pecl install pdo_sqlsrv \
303303
&& docker-php-ext-enable pdo_sqlsrv \
304304
&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
305305
&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
@@ -363,7 +363,7 @@ RUN set -x \
363363
&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
364364
\
365365
# ---- Installing PHP Extension: sqlsrv ----
366-
&& pecl install sqlsrv-5.5.0preview \
366+
&& pecl install sqlsrv \
367367
&& docker-php-ext-enable sqlsrv \
368368
&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
369369
&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \

‎build/ansible/group_vars/all.yml‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,6 +1016,18 @@ extensions_available:
10161016
5.2:
10171017
type: pecl
10181018
version: 2.0.7
1019+
5.3:
1020+
type: pecl
1021+
version: 2.0.8
1022+
5.4:
1023+
type: pecl
1024+
version: 2.0.8
1025+
5.5:
1026+
type: pecl
1027+
version: 2.0.8
1028+
5.6:
1029+
type: pecl
1030+
version: 2.0.8
10191031
all:
10201032
type: pecl
10211033
imagick:
@@ -1109,14 +1121,17 @@ extensions_available:
11091121
7.0:
11101122
type: git
11111123
git_url: https://github.com/websupport-sk/pecl-memcache
1124+
git_ref: origin/php7
11121125
configure: --with-zlib-dir=/usr
11131126
7.1:
11141127
type: git
11151128
git_url: https://github.com/websupport-sk/pecl-memcache
1129+
git_ref: origin/php7
11161130
configure: --with-zlib-dir=/usr
11171131
7.2:
11181132
type: git
11191133
git_url: https://github.com/websupport-sk/pecl-memcache
1134+
git_ref: origin/php7
11201135
configure: --with-zlib-dir=/usr
11211136
all:
11221137
type: pecl
@@ -1314,9 +1329,9 @@ extensions_available:
13141329
already_avail: "{{ php_all_versions }}"
13151330
pdo_sqlsrv:
13161331
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
1317-
7.3:
1332+
7.0:
13181333
type: pecl
1319-
version: 5.5.0preview
1334+
version: 5.3.0
13201335
build_dep: [unixodbc-dev]
13211336
run_dep: [unixodbc]
13221337
all:
@@ -1455,9 +1470,9 @@ extensions_available:
14551470
already_avail: "{{ php_all_versions }}"
14561471
sqlsrv:
14571472
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
1458-
7.3:
1473+
7.0:
14591474
type: pecl
1460-
version: 5.5.0preview
1475+
version: 5.3.0
14611476
build_dep: [unixodbc-dev]
14621477
run_dep: [unixodbc]
14631478
all:

0 commit comments

Comments
 (0)