Skip to content

Commit e087ed3

Browse files
cytopiacytopia
authored
Merge pull request #205 from devilbox/release-0.125
Release 0.125
2 parents 25e0e12 + 2ac845a commit e087ed3

18 files changed

+49
-17
lines changed

‎.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- '8.1'
4141
refs:
4242
- 'master'
43-
- '0.124'
43+
- '0.125'
4444
steps:
4545

4646
# ------------------------------------------------------------

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
## Unreleased
55

66

7+
## Release 0.125
8+
9+
#### Changed
10+
- Re-added `opcache` for PHP 8.1
11+
- Pin `ansible` version for all work images
12+
- Pin `wp-cli` version for PHP 5.4 and 5.5
13+
14+
715
## Release 0.124
816

917
#### Fixed

‎Dockerfiles/mods/Dockerfile-8.1

+13
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,17 @@ RUN set -eux \
312312
&& true
313313

314314

315+
# -------------------- Installing PHP Extension: opcache --------------------
316+
RUN set -eux \
317+
# Version specific pre-command
318+
&& curl -sS https://raw.githubusercontent.com/php/php-src/php-8.0.6/ext/opcache/Optimizer/zend_dfg.h > /usr/local/include/php/Zend/Optimizer/zend_dfg.h \
319+
# Installation: Version specific
320+
# Type: Built-in extension
321+
# Installation
322+
&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
323+
&& true
324+
325+
315326
# -------------------- Installing PHP Extension: pcntl --------------------
316327
RUN set -eux \
317328
# Installation: Generic
@@ -749,6 +760,8 @@ RUN set -eux \
749760
&& php-fpm -m | grep -oiE '^oauth$' \
750761
&& php -m | grep -oiE '^oci8$' \
751762
&& php-fpm -m | grep -oiE '^oci8$' \
763+
&& php -m | grep -oiE '^Zend Opcache$' \
764+
&& php-fpm -m | grep -oiE '^Zend Opcache$' \
752765
&& php -m | grep -oiE '^openssl$' \
753766
&& php-fpm -m | grep -oiE '^openssl$' \
754767
&& php -m | grep -oiE '^pcntl$' \

‎Dockerfiles/work/Dockerfile-5.2

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ RUN set -eux \
391391
###
392392
RUN set -eux \
393393
# -------------------- ansible --------------------
394-
&& pip install --no-cache-dir --force-reinstall ansible || true \
394+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
395395
\
396396
# -------------------- yamllint --------------------
397397
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-5.3

+1-1
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ RUN set -eux \
452452
###
453453
RUN set -eux \
454454
# -------------------- ansible --------------------
455-
&& pip install --no-cache-dir --force-reinstall ansible || true \
455+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
456456
\
457457
# -------------------- yamllint --------------------
458458
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ RUN set -eux \
334334
\
335335
\
336336
# -------------------- wpcli --------------------
337-
&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
337+
&& curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar -L -o /usr/local/bin/wp \
338338
&& chmod +x /usr/local/bin/wp \
339339
\
340340
# -------------------- cleanup --------------------
@@ -486,7 +486,7 @@ RUN set -eux \
486486
###
487487
RUN set -eux \
488488
# -------------------- ansible --------------------
489-
&& pip install --no-cache-dir --force-reinstall ansible || true \
489+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
490490
\
491491
# -------------------- yamllint --------------------
492492
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-5.5

+2-2
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ RUN set -eux \
340340
\
341341
\
342342
# -------------------- wpcli --------------------
343-
&& curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
343+
&& curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar -L -o /usr/local/bin/wp \
344344
&& chmod +x /usr/local/bin/wp \
345345
\
346346
# -------------------- cleanup --------------------
@@ -504,7 +504,7 @@ RUN set -eux \
504504
###
505505
RUN set -eux \
506506
# -------------------- ansible --------------------
507-
&& pip install --no-cache-dir --force-reinstall ansible || true \
507+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
508508
\
509509
# -------------------- yamllint --------------------
510510
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-5.6

+1-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ RUN set -eux \
516516
###
517517
RUN set -eux \
518518
# -------------------- ansible --------------------
519-
&& pip install --no-cache-dir --force-reinstall ansible || true \
519+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
520520
\
521521
# -------------------- yamllint --------------------
522522
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-7.0

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ RUN set -eux \
497497
###
498498
RUN set -eux \
499499
# -------------------- ansible --------------------
500-
&& pip install --no-cache-dir --force-reinstall ansible || true \
500+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
501501
\
502502
# -------------------- yamllint --------------------
503503
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-7.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ RUN set -eux \
496496
###
497497
RUN set -eux \
498498
# -------------------- ansible --------------------
499-
&& pip install --no-cache-dir --force-reinstall ansible || true \
499+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
500500
\
501501
# -------------------- yamllint --------------------
502502
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-7.2

+1-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ RUN set -eux \
516516
###
517517
RUN set -eux \
518518
# -------------------- ansible --------------------
519-
&& pip install --no-cache-dir --force-reinstall ansible || true \
519+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
520520
\
521521
# -------------------- yamllint --------------------
522522
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-7.3

+1-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ RUN set -eux \
516516
###
517517
RUN set -eux \
518518
# -------------------- ansible --------------------
519-
&& pip install --no-cache-dir --force-reinstall ansible || true \
519+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
520520
\
521521
# -------------------- yamllint --------------------
522522
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-7.4

+1-1
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ RUN set -eux \
511511
###
512512
RUN set -eux \
513513
# -------------------- ansible --------------------
514-
&& pip install --no-cache-dir --force-reinstall ansible || true \
514+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
515515
\
516516
# -------------------- yamllint --------------------
517517
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-8.0

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ RUN set -eux \
415415
###
416416
RUN set -eux \
417417
# -------------------- ansible --------------------
418-
&& pip install --no-cache-dir --force-reinstall ansible || true \
418+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
419419
\
420420
# -------------------- yamllint --------------------
421421
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎Dockerfiles/work/Dockerfile-8.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ RUN set -eux \
415415
###
416416
RUN set -eux \
417417
# -------------------- ansible --------------------
418-
&& pip install --no-cache-dir --force-reinstall ansible || true \
418+
&& pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \
419419
\
420420
# -------------------- yamllint --------------------
421421
&& pip install --no-cache-dir --force-reinstall yamllint || true \

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules.
685685
<tr>
686686
<th>8.1</th>
687687
<td id="81-base">Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
688-
<td id="81-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xml, xmlreader, xmlwriter, xsl, yaml, zip, zlib</td>
688+
<td id="81-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
689689
</tr>
690690
</tbody>
691691
</table>

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ extensions_available:
660660
odbc:
661661
disabled: "{{ php_all_versions }}" # TODO: sqlext.h' not found!
662662
opcache:
663-
disabled: [8.1] # TODO: fatal error: zend_dfg.h: No such file or directory
663+
disabled: []
664664
5.2:
665665
type: pecl
666666
command: pecl install zendopcache
@@ -670,6 +670,9 @@ extensions_available:
670670
5.4:
671671
type: pecl
672672
command: pecl install zendopcache
673+
8.1:
674+
type: builtin
675+
pre: curl -sS https://raw.githubusercontent.com/php/php-src/php-8.0.6/ext/opcache/Optimizer/zend_dfg.h > /usr/local/include/php/Zend/Optimizer/zend_dfg.h
673676
all:
674677
type: builtin
675678
openssl:

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

+8
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,8 @@ npm_available:
368368
pip_available:
369369
ansible:
370370
name: ansible
371+
all:
372+
version: 3.4.0
371373
check: ansible --version | grep -E '^ansible [0-9][.0-9]+$'
372374
yamllint:
373375
name: yamllint
@@ -894,6 +896,12 @@ software_available:
894896
5.3:
895897
command: curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp
896898
post: chmod +x /usr/local/bin/wp
899+
5.4:
900+
command: curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar -L -o /usr/local/bin/wp
901+
post: chmod +x /usr/local/bin/wp
902+
5.5:
903+
command: curl -sS -L --fail https://github.com/wp-cli/wp-cli/releases/download/v2.4.0/wp-cli-2.4.0.phar -L -o /usr/local/bin/wp
904+
post: chmod +x /usr/local/bin/wp
897905
all:
898906
command: curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp
899907
post: chmod +x /usr/local/bin/wp

0 commit comments

Comments
 (0)