diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8167555..797e5b1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -40,7 +40,7 @@ jobs: - '8.1' refs: - 'master' - - '0.124' + - '0.125' steps: # ------------------------------------------------------------ diff --git a/CHANGELOG.md b/CHANGELOG.md index 3498c4c..dcc11ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ ## Unreleased +## Release 0.125 + +#### Changed +- Re-added `opcache` for PHP 8.1 +- Pin `ansible` version for all work images +- Pin `wp-cli` version for PHP 5.4 and 5.5 + + ## Release 0.124 #### Fixed diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 1263c8b..bf93219 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -312,6 +312,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: opcache -------------------- +RUN set -eux \ + # Version specific pre-command + && 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 \ + # Installation: Version specific + # Type: Built-in extension + # Installation + && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ + && true + + # -------------------- Installing PHP Extension: pcntl -------------------- RUN set -eux \ # Installation: Generic @@ -749,6 +760,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^oauth$' \ && php -m | grep -oiE '^oci8$' \ && php-fpm -m | grep -oiE '^oci8$' \ + && php -m | grep -oiE '^Zend Opcache$' \ + && php-fpm -m | grep -oiE '^Zend Opcache$' \ && php -m | grep -oiE '^openssl$' \ && php-fpm -m | grep -oiE '^openssl$' \ && php -m | grep -oiE '^pcntl$' \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 768b68d..c7b30e1 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -391,7 +391,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 2f1a63a..9ab6d02 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -452,7 +452,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index f1b55a6..ded3ba9 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -334,7 +334,7 @@ RUN set -eux \ \ \ # -------------------- wpcli -------------------- - && curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ + && 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 \ && chmod +x /usr/local/bin/wp \ \ # -------------------- cleanup -------------------- @@ -486,7 +486,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 5f33eec..de37fb8 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -340,7 +340,7 @@ RUN set -eux \ \ \ # -------------------- wpcli -------------------- - && curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \ + && 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 \ && chmod +x /usr/local/bin/wp \ \ # -------------------- cleanup -------------------- @@ -504,7 +504,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 24f83fc..a3c89ff 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -516,7 +516,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index ae7599c..326b246 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -497,7 +497,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 94eb071..4dde7f8 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -496,7 +496,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 1fe7745..a7c1f7d 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -516,7 +516,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index b007c81..f161446 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -516,7 +516,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index bc6bfdd..fa84443 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -511,7 +511,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 88c449c..bec025d 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -415,7 +415,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 36a1d4d..176efc2 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -415,7 +415,7 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ + && pip install --no-cache-dir --force-reinstall ansible==3.4.0 || true \ \ # -------------------- yamllint -------------------- && pip install --no-cache-dir --force-reinstall yamllint || true \ diff --git a/README.md b/README.md index 2813147..b20c2f3 100644 --- a/README.md +++ b/README.md @@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules. 8.1 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 - 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 + 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 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 19de87f..b575f04 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -660,7 +660,7 @@ extensions_available: odbc: disabled: "{{ php_all_versions }}" # TODO: sqlext.h' not found! opcache: - disabled: [8.1] # TODO: fatal error: zend_dfg.h: No such file or directory + disabled: [] 5.2: type: pecl command: pecl install zendopcache @@ -670,6 +670,9 @@ extensions_available: 5.4: type: pecl command: pecl install zendopcache + 8.1: + type: builtin + 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 all: type: builtin openssl: diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index d433710..64442ce 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -368,6 +368,8 @@ npm_available: pip_available: ansible: name: ansible + all: + version: 3.4.0 check: ansible --version | grep -E '^ansible [0-9][.0-9]+$' yamllint: name: yamllint @@ -894,6 +896,12 @@ software_available: 5.3: 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 post: chmod +x /usr/local/bin/wp + 5.4: + 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 + post: chmod +x /usr/local/bin/wp + 5.5: + 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 + post: chmod +x /usr/local/bin/wp all: command: curl -sS -L --fail https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp post: chmod +x /usr/local/bin/wp