From 8d89ed4b02cc2d19396fc4925e21fd5f05dfc889 Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 19 May 2021 19:46:01 +0200 Subject: [PATCH 1/6] Re-added opcache for PHP 8.1 --- CHANGELOG.md | 6 ++++++ Dockerfiles/mods/Dockerfile-8.1 | 13 +++++++++++++ README.md | 2 +- build/ansible/group_vars/all/mods.yml | 5 ++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3498c4c..542808b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.125 + +#### Changed +- Re-added `opcache` for PHP 8.1 + + ## Release 0.124 #### Fixed diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 1263c8b..8b05bb8 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 + && wget https://raw.githubusercontent.com/php/php-src/php-8.0.6/ext/opcache/Optimizer/zend_dfg.h -P /usr/local/include/php/Zend/Optimizer \ + # 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/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..6b71de4 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: wget https://raw.githubusercontent.com/php/php-src/php-8.0.6/ext/opcache/Optimizer/zend_dfg.h -P /usr/local/include/php/Zend/Optimizer all: type: builtin openssl: From 58aa3c6abfb93eacbb9b9c67b14e56bd75f30c2b Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 19 May 2021 19:48:22 +0200 Subject: [PATCH 2/6] Update workflows --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: # ------------------------------------------------------------ From 518d0d908d7adbb388288c296bdbd7b0205a07b2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 19 May 2021 20:09:42 +0200 Subject: [PATCH 3/6] Pin Ansible to specific version --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-5.2 | 2 +- Dockerfiles/work/Dockerfile-5.3 | 2 +- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 2 +- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- Dockerfiles/work/Dockerfile-8.0 | 2 +- Dockerfiles/work/Dockerfile-8.1 | 2 +- build/ansible/group_vars/all/work.yml | 2 ++ 14 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 542808b..708397d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ #### Changed - Re-added `opcache` for PHP 8.1 +- Pin `ansible` version for all work images ## Release 0.124 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..04e7a40 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -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..abf0799 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -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/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index d433710..a0ccfee 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 From f9113317fc6217bedb43e84f71eb964e4436e55e Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 19 May 2021 20:27:20 +0200 Subject: [PATCH 4/6] Replace wget with curl for header download --- Dockerfiles/mods/Dockerfile-8.1 | 2 +- build/ansible/group_vars/all/mods.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 8b05bb8..bf93219 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -315,7 +315,7 @@ RUN set -eux \ # -------------------- Installing PHP Extension: opcache -------------------- RUN set -eux \ # Version specific pre-command - && wget https://raw.githubusercontent.com/php/php-src/php-8.0.6/ext/opcache/Optimizer/zend_dfg.h -P /usr/local/include/php/Zend/Optimizer \ + && 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 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 6b71de4..b575f04 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -672,7 +672,7 @@ extensions_available: command: pecl install zendopcache 8.1: type: builtin - pre: wget https://raw.githubusercontent.com/php/php-src/php-8.0.6/ext/opcache/Optimizer/zend_dfg.h -P /usr/local/include/php/Zend/Optimizer + 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: From 6634169b3f0a2dc7e7c61dec04452483759304ed Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 19 May 2021 21:43:09 +0200 Subject: [PATCH 5/6] Pin wp-cli version for PHP 5.4 and 5.5 --- Dockerfiles/work/Dockerfile-5.4 | 2 +- Dockerfiles/work/Dockerfile-5.5 | 2 +- build/ansible/group_vars/all/work.yml | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 04e7a40..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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index abf0799..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 -------------------- diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index a0ccfee..64442ce 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -896,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 From 2ac845ab7478cbb0306b81c879cdf7eef0f47eba Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 19 May 2021 21:43:25 +0200 Subject: [PATCH 6/6] Update project files --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 708397d..dcc11ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ #### 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