diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fa4b4f..3745045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,12 @@ ## Release 0.124 #### Changed -- Removed `linuxbrew` +- Updated `pdo_sqlsrv` for PHP 7.2 +- Updated `swoole` for PHP 7.1 +- Update to Python3 on work images +- Removed `opcache` for PHP 8.1 +- Removed `linuxbrew` for all work images +- Remove pip packages for PHP 5.2 on work image ## Release 0.123 diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index fca412c..dc67ef0 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -441,6 +441,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -724,6 +726,8 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 6dd6575..94ffc64 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -445,6 +445,8 @@ RUN set -eux \ && pecl install psr-0.5.1 \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -460,6 +462,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -743,6 +747,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 8144b9b..508fee1 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -450,6 +450,8 @@ RUN set -eux \ && pecl install psr-0.5.1 \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -465,6 +467,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -770,6 +774,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index abb9286..fe6fe3b 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -467,6 +467,8 @@ RUN set -eux \ && pecl install psr-0.6.0 \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -482,6 +484,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -787,6 +791,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index ebbd5ba..6c8ec11 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -501,6 +501,8 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -516,6 +518,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -912,6 +916,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 812130c..9dc967d 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -501,6 +501,8 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -516,6 +518,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -643,10 +647,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: swoole -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension - # Custom: Pecl command - && yes yes | pecl install swoole \ + # Default: Pecl command + && pecl install swoole-4.4.26 \ # Enabling && docker-php-ext-enable swoole \ && true @@ -924,6 +928,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 25b7a1e..6d39532 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -479,10 +479,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: pdo_sqlsrv -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command - && pecl install pdo_sqlsrv \ + && pecl install pdo_sqlsrv-5.8.1 \ # Enabling && docker-php-ext-enable pdo_sqlsrv \ && true @@ -504,6 +504,8 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -519,6 +521,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -927,6 +931,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 3e60bc1..16daa05 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -504,6 +504,8 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -519,6 +521,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -927,6 +931,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 1852362..a1e4460 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -506,6 +506,8 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -521,6 +523,8 @@ RUN set -eux \ && cd build && ./install \ # Enabling && docker-php-ext-enable phalcon \ + # Generic post-command + && echo 'true' \ && true @@ -911,6 +915,10 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ + # ---------- phalcon ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index 944d683..34f9461 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -422,6 +422,8 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -693,6 +695,8 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ && true diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 3bfa46c..15ee374 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -312,14 +312,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: opcache -------------------- -RUN set -eux \ - # Installation: Generic - # Type: Built-in extension - && docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \ - && true - - # -------------------- Installing PHP Extension: pcntl -------------------- RUN set -eux \ # Installation: Generic @@ -397,6 +389,8 @@ RUN set -eux \ && pecl install psr \ # Enabling && docker-php-ext-enable psr \ + # Generic post-command + && echo 'true' \ && true @@ -676,6 +670,8 @@ RUN set -eux \ && ORACLE_VERSION_FULL="$( echo "${ORACLE_HREF}" | grep -Eo 'basiclite-[-.0-9]+' | sed -e 's/basiclite-//g' -e 's/\.$//g' )" \ && (ln -sf /usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/*.so* /usr/lib/ || true) \ \ + # ---------- psr ---------- + && echo 'true' \ && true @@ -768,8 +764,6 @@ 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 bccef16..bd3db6d 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -132,16 +132,6 @@ RUN set -eux \ ### Install custom software ### RUN set -eux \ -# -------------------- pip -------------------- - && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ -&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ -&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ -&& rm -rf /var/lib/apt/lists/* \ -\ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ - \ - \ # -------------------- nvm -------------------- && git clone https://github.com/creationix/nvm /opt/nvm \ && cd /opt/nvm \ @@ -375,15 +365,6 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ -# -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible || true \ - \ -# -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint || true \ - \ -# -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq || true \ - \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -450,9 +431,6 @@ RUN set -eux \ # -------------------- Composer -------------------- \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [0-9][.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' \ \ # -------------------- NPM -------------------- && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index ed869de..9e587ab 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index dd5c337..7684f84 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index ce7bf59..d0364ff 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 81f5c84..fc99e31 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -144,11 +144,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 0128588..ac37b41 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -144,11 +144,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 14892c3..06a7d68 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 362f036..beec57f 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index cf8e3d9..6f2bd94 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 07e9646..7a83144 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 367b2e9..5aa455d 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 849dcf7..ce2152b 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -143,11 +143,11 @@ RUN set -eux \ # -------------------- pip -------------------- && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ -&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ +&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ \ \ # -------------------- nvm -------------------- diff --git a/README.md b/README.md index 1287a03..9a7a358 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, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, 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, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, zip, zlib @@ -823,7 +823,7 @@ Have a look at the following table to see all supported environment variables fo ENABLE_MODULES string '' - Comma separated list of PHP modules to enable, which are not enabled by default.
Example:
ENABLE_MODULES=blackfire, ioncube + Comma separated list of PHP modules to enable, which are not enabled by default.
Example:
ENABLE_MODULES=blackfire, ioncube, psr, phalcon DISABLE_MODULES diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 6052bb2..e201d33 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -660,6 +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 5.2: type: pecl command: pecl install zendopcache @@ -755,6 +756,11 @@ extensions_available: version: 5.6.1 build_dep: [unixodbc-dev] run_dep: [unixodbc] + 7.2: + type: pecl + version: 5.8.1 + build_dep: [unixodbc-dev] + run_dep: [unixodbc] all: type: pecl build_dep: [unixodbc-dev] @@ -777,6 +783,7 @@ extensions_available: version: 0.6.0 # NOTE: 0.6.1 fails with: Package "psr" Version "0.6.1" does not have REST xml available all: type: pecl + post: echo 'true' # FIXME: disable module phalcon: disabled: [5.2, 8.0, 8.1] # TODO: currently disabled for 7.4 as it breaks 5.3: @@ -814,6 +821,7 @@ extensions_available: git_url: https://github.com/phalcon/cphalcon git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) command: cd build && ./install + post: echo 'true' # FIXME: disable module phar: already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1] 5.2: @@ -992,6 +1000,9 @@ extensions_available: 7.0: type: pecl version: 4.2.13 + 7.1: + type: pecl + version: 4.4.26 all: type: pecl command: yes yes | pecl install swoole diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 639781e..15c29ba 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -367,12 +367,15 @@ npm_available: # pip_available: ansible: + disabled: [5.2] name: ansible check: ansible --version | grep -E '^ansible [0-9][.0-9]+$' yamllint: + disabled: [5.2] name: yamllint check: yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' yq: + disabled: [5.2] name: yq check: yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' @@ -405,15 +408,16 @@ software_available: && ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \ # pip is a dependency for others pip: + disabled: [5.2] all: command: | DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ - libpython-dev \ + libpython3-dev python3 \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* \ \ - && curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ + && curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \ # nvm is a dependency for others nvm: check: su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+'