Skip to content

Commit

Permalink
Merge pull request #101 from devilbox/release-0.77
Browse files Browse the repository at this point in the history 
Fix igbinary for PHP 5.3, 5.4, 5.5 and 5.6
  • Loading branch information
@cytopia
cytopia authored Mar 2, 2019
2 parents 481d095 + ceabd15 commit 554e979
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfiles/mods/Dockerfile-5.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
\
# ---- Installing PHP Extension: igbinary ----
&& pecl install igbinary \
&& pecl install igbinary-2.0.8 \
&& docker-php-ext-enable igbinary \
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/mods/Dockerfile-5.4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
\
# ---- Installing PHP Extension: igbinary ----
&& pecl install igbinary \
&& pecl install igbinary-2.0.8 \
&& docker-php-ext-enable igbinary \
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/mods/Dockerfile-5.5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
\
# ---- Installing PHP Extension: igbinary ----
&& pecl install igbinary \
&& pecl install igbinary-2.0.8 \
&& docker-php-ext-enable igbinary \
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/mods/Dockerfile-5.6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
\
# ---- Installing PHP Extension: igbinary ----
&& pecl install igbinary \
&& pecl install igbinary-2.0.8 \
&& docker-php-ext-enable igbinary \
&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
Expand Down
5 changes: 3 additions & 2 deletions Dockerfiles/mods/Dockerfile-7.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ RUN set -x \
# ---- Installing PHP Extension: memcache ----
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
&& cd /tmp/memcache \
&& git checkout origin/php7 \
&& phpize \
&& ./configure --with-zlib-dir=/usr \
&& make -j$(getconf _NPROCESSORS_ONLN) \
Expand Down Expand Up @@ -328,7 +329,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
\
# ---- Installing PHP Extension: pdo_sqlsrv ----
&& pecl install pdo_sqlsrv \
&& pecl install pdo_sqlsrv-5.3.0 \
&& docker-php-ext-enable pdo_sqlsrv \
&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
Expand Down Expand Up @@ -392,7 +393,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
\
# ---- Installing PHP Extension: sqlsrv ----
&& pecl install sqlsrv \
&& pecl install sqlsrv-5.3.0 \
&& docker-php-ext-enable sqlsrv \
&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
Expand Down
1 change: 1 addition & 0 deletions Dockerfiles/mods/Dockerfile-7.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ RUN set -x \
# ---- Installing PHP Extension: memcache ----
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
&& cd /tmp/memcache \
&& git checkout origin/php7 \
&& phpize \
&& ./configure --with-zlib-dir=/usr \
&& make -j$(getconf _NPROCESSORS_ONLN) \
Expand Down
1 change: 1 addition & 0 deletions Dockerfiles/mods/Dockerfile-7.2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ RUN set -x \
# ---- Installing PHP Extension: memcache ----
&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
&& cd /tmp/memcache \
&& git checkout origin/php7 \
&& phpize \
&& ./configure --with-zlib-dir=/usr \
&& make -j$(getconf _NPROCESSORS_ONLN) \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfiles/mods/Dockerfile-7.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
\
# ---- Installing PHP Extension: pdo_sqlsrv ----
&& pecl install pdo_sqlsrv-5.5.0preview \
&& pecl install pdo_sqlsrv \
&& docker-php-ext-enable pdo_sqlsrv \
&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
Expand Down Expand Up @@ -363,7 +363,7 @@ RUN set -x \
&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
\
# ---- Installing PHP Extension: sqlsrv ----
&& pecl install sqlsrv-5.5.0preview \
&& pecl install sqlsrv \
&& docker-php-ext-enable sqlsrv \
&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
Expand Down
23 changes: 19 additions & 4 deletions build/ansible/group_vars/all.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,18 @@ extensions_available:
5.2:
type: pecl
version: 2.0.7
5.3:
type: pecl
version: 2.0.8
5.4:
type: pecl
version: 2.0.8
5.5:
type: pecl
version: 2.0.8
5.6:
type: pecl
version: 2.0.8
all:
type: pecl
imagick:
Expand Down Expand Up @@ -1109,14 +1121,17 @@ extensions_available:
7.0:
type: git
git_url: https://github.com/websupport-sk/pecl-memcache
git_ref: origin/php7
configure: --with-zlib-dir=/usr
7.1:
type: git
git_url: https://github.com/websupport-sk/pecl-memcache
git_ref: origin/php7
configure: --with-zlib-dir=/usr
7.2:
type: git
git_url: https://github.com/websupport-sk/pecl-memcache
git_ref: origin/php7
configure: --with-zlib-dir=/usr
all:
type: pecl
Expand Down Expand Up @@ -1314,9 +1329,9 @@ extensions_available:
already_avail: "{{ php_all_versions }}"
pdo_sqlsrv:
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
7.3:
7.0:
type: pecl
version: 5.5.0preview
version: 5.3.0
build_dep: [unixodbc-dev]
run_dep: [unixodbc]
all:
Expand Down Expand Up @@ -1455,9 +1470,9 @@ extensions_available:
already_avail: "{{ php_all_versions }}"
sqlsrv:
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
7.3:
7.0:
type: pecl
version: 5.5.0preview
version: 5.3.0
build_dep: [unixodbc-dev]
run_dep: [unixodbc]
all:
Expand Down

0 comments on commit 554e979

Please sign in to comment.