diff --git a/CHANGELOG.md b/CHANGELOG.md index 3745045..c2b7808 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,18 @@ ## Release 0.124 +#### Fixed +- Fixed `pdo_sqlsrv` version for PHP 7.2 +- Fixed `sqlsrv` version for PHP 7.2 +- Fixed `swoole` version for PHP 7.1 + #### Changed -- 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 +- Removed `xlswriter` for PHP 8.1 +- Removed `linuxbrew` for all versions +- Removed `ansible` for all versions +- Removed `yamllint` for all versions +- Updated Python2 to Python3 ## Release 0.123 diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 6d39532..11e7548 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -628,10 +628,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: sqlsrv -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command - && pecl install sqlsrv \ + && pecl install sqlsrv-5.8.1 \ # Enabling && docker-php-ext-enable sqlsrv \ && true diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 15ee374..b08a7d5 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -543,17 +543,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: xlswriter -------------------- -RUN set -eux \ - # Installation: Generic - # Type: PECL extension - # Default: Pecl command - && pecl install xlswriter \ - # Enabling - && docker-php-ext-enable xlswriter \ - && true - - # -------------------- Installing PHP Extension: yaml -------------------- RUN set -eux \ # Installation: Generic @@ -835,8 +824,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^xmlwriter$' \ && php -m | grep -oiE '^xsl$' \ && php-fpm -m | grep -oiE '^xsl$' \ - && php -m | grep -oiE '^xlswriter$' \ - && php-fpm -m | grep -oiE '^xlswriter$' \ && php -m | grep -oiE '^yaml$' \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index bd3db6d..1e39e2c 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -132,6 +132,16 @@ 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 \ + libpython3-dev \ + python3 \ + python3-pip \ +&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ +&& rm -rf /var/lib/apt/lists/* \ + \ + \ # -------------------- nvm -------------------- && git clone https://github.com/creationix/nvm /opt/nvm \ && cd /opt/nvm \ @@ -365,6 +375,9 @@ RUN set -eux \ ### Install pip (Python) packages ### RUN set -eux \ +# -------------------- yq -------------------- + && pip3 install --no-cache-dir --force-reinstall yq || true \ + \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -431,6 +444,7 @@ RUN set -eux \ # -------------------- Composer -------------------- \ # -------------------- PIP -------------------- + && 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 9e587ab..3821592 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -436,14 +436,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -519,8 +513,6 @@ RUN set -eux \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 7684f84..3fcbf65 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -470,14 +470,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -557,8 +551,6 @@ RUN set -eux \ && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index d0364ff..5590f7f 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -488,14 +488,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -579,8 +573,6 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index fc99e31..22c7ba1 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -500,14 +500,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -592,8 +586,6 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index ac37b41..f5f1262 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -500,14 +500,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -592,8 +586,6 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 06a7d68..680a09c 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -499,14 +499,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -591,8 +585,6 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index beec57f..a25be33 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -500,14 +500,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -592,8 +586,6 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 6f2bd94..3955c91 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -500,14 +500,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -592,8 +586,6 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 7a83144..905e2f7 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -495,14 +495,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -586,8 +580,6 @@ RUN set -eux \ && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- 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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 5aa455d..eac4884 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -399,14 +399,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -479,8 +473,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 -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index ce2152b..558d2a1 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ \ \ # -------------------- nvm -------------------- @@ -399,14 +399,8 @@ 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 \ + && pip3 install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -479,8 +473,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 -------------------- diff --git a/README.md b/README.md index 9a7a358..f7a549a 100644 --- a/README.md +++ b/README.md @@ -989,10 +989,6 @@ You want to use tools such as `git`, `drush`, `composer`, `npm`, `eslint`, `phpc Description - - Ansible - Automation tool. - asgardcms AsgardCMS cli installer. @@ -1129,10 +1125,6 @@ You want to use tools such as `git`, `drush`, `composer`, `npm`, `eslint`, `phpc wp-cli WP-CLI is the command-line interface for WordPress. - - yamllint - Yaml command line linter. - yarn Fast, reliable and secure dependency management. diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 6f710dc..7926bcc 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -391,13 +391,13 @@ RUN set -eux \ {%- endif -%} {#- Version specific gem version available? -#} {%- if php_version in pip_available[tool] and 'version' in pip_available[tool][php_version] -%} - {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} || true \ + {{ "\n\t" }}&& pip3 install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} || true \ {#- Generic gem version available? -#} {%- elif 'all' in pip_available[tool] and 'version' in pip_available[tool]['all'] -%} - {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} || true \ + {{ "\n\t" }}&& pip3 install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} || true \ {#- No version info available -#} {%- else -%} - {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} || true \ + {{ "\n\t" }}&& pip3 install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} || true \ {%- endif -%} {#- Fail fast version -#} {%- if build_fail_fast -%} diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index e201d33..e7814ae 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -969,6 +969,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] @@ -1187,7 +1192,7 @@ extensions_available: all: type: pecl xlswriter: - disabled: [5.2, 5.3, 5.4, 5.5, 5.6] + disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1] # TODO: re-enable for PHP 8.1 all: type: pecl build_dep: [zlib1g-dev] diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 15c29ba..94d29ca 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -73,8 +73,8 @@ npm_enabled: # Python pip packages to install # ------------------------------------------------------------------------------------------------- pip_enabled: - - ansible - - yamllint + #- ansible + #- yamllint - yq @@ -367,15 +367,12 @@ 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]+$' @@ -408,16 +405,15 @@ 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 \ - libpython3-dev python3 \ + libpython3-dev \ + python3 \ + python3-pip \ && 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 | python3 \ # nvm is a dependency for others nvm: check: su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+'