diff --git a/CHANGELOG.md b/CHANGELOG.md index 3983653..fbf8544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,24 @@ ## Unreleased +## Release 0.108 + +#### Added +- Added ghostscript +- Added gsfonts +- Added imagick PDF support (via ghostscript) +- Added mupdf and mupdf-tools + +#### Fixed +- Fixes Ansible installation +- Fixes MongoDB for PHP 5.6 +- Fixes Redis for PHP 8.0 +- Fixes policy.xml for Imagick + +#### Changed +- Stricter version check for installed tools + + ## Release 0.107 #### Fixed diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index f20400a..a159537 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -12,6 +12,7 @@ RUN set -eux \ alien \ firebird-dev \ freetds-dev \ + ghostscript \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -206,6 +207,15 @@ RUN set -eux \ && docker-php-ext-enable imagick \ # Generic post-command && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*|g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ +&& sed -i'' 's|.*algorithm)//g' redis_array_impl.c \ +&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' library.c \ +&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' redis_array_impl.c \ +&& sed -i'' 's|.*sctx->cb\.no_separation.*||g' cluster_library.c \ +&& sed -i'' 's|.*->no_separation.*||g' redis_array_impl.c \ && phpize \ && ./configure --enable-redis \ && make -j$(getconf _NPROCESSORS_ONLN) \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index c2d5d4c..b7f42a8 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mysql-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -384,13 +387,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -443,38 +446,38 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && git-flow version | grep -E '[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ \ # -------------------- Composer -------------------- \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 8f979ff..7f48ddd 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mysql-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -440,13 +443,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -499,46 +502,46 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ - && git-flow version | grep -E '[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index aa56137..62697aa 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mysql-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -474,13 +477,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -533,50 +536,50 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 9903461..e825d4e 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mysql-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -491,13 +494,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -550,54 +553,54 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ - && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ - && photon --version | grep -E 'Installer [.0-9]+' \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ + && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index ddb8b65..a953b5c 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mysql-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -502,13 +505,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -561,55 +564,55 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ - && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ - && photon --version | grep -E 'Installer [.0-9]+' \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ + && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index dd7ec1b..790fff6 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mysql-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -502,13 +505,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -561,55 +564,55 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ - && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ - && photon --version | grep -E 'Installer [.0-9]+' \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ + && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 10c7b74..1ada5ac 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mariadb-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -502,13 +505,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -561,55 +564,55 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ - && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ - && photon --version | grep -E 'Installer [.0-9]+' \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ + && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 1b97bc6..965299f 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mariadb-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -503,13 +506,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -562,55 +565,55 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ - && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ - && photon --version | grep -E 'Installer [.0-9]+' \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ + && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 2f8336f..c6f0ad8 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mariadb-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -503,13 +506,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -562,55 +565,55 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ - && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ + && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ - && photon --version | grep -E 'Installer [.0-9]+' \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ + && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index d430729..c92ae0d 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mariadb-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -498,13 +501,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -557,54 +560,54 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ && drush7 --version | grep -E '7[.0-9]+\s*$' \ && drush8 --version | grep -E '8[.0-9]+\s*$' \ && drush9 --version | grep -E '9[.0-9]+\s*$' \ - && drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \ - && git-flow version | grep -E '[.0-9]+' \ - && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phalcon commands | grep -E '[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phalcon commands | grep -E '[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- - && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' \ - && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \ - && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ - && photon --version | grep -E 'Installer [.0-9]+' \ + && asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' \ + && codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' \ + && photon --version | grep -E 'Installer [0-9][.0-9]+' \ \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 8f901ec..20a35e4 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -74,6 +74,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -89,6 +90,8 @@ RUN set -eux \ mongodb-org-tools \ moreutils \ mariadb-client \ + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -403,13 +406,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ @@ -462,43 +465,43 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ - && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ - && regex-grep --version | grep -E '[.0-9]+' \ - && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \ - && git-flow version | grep -E '[.0-9]+' \ - && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ - && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ - && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ - && phpcs --version | grep -E 'version [.0-9]+' \ - && phpcbf --version | grep -E 'version [.0-9]+' \ - && phpmd --version | grep -E '^PHPMD [.0-9]+' \ - && symfony -V | grep -Ei 'version\s*.*v[.0-9]+' \ - && wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \ - && wp --allow-root --version | grep -E '[.0-9]+' \ + && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' \ + && regex-grep --version | grep -E '[0-9][.0-9]+' \ + && dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \ + && git-flow version | grep -E '[0-9][.0-9]+' \ + && linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' \ + && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' \ + && mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' \ + && phpcs --version | grep -E 'version [0-9][.0-9]+' \ + && phpcbf --version | grep -E 'version [0-9][.0-9]+' \ + && phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' \ + && symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' \ + && wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" \ + && wp --allow-root --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Composer -------------------- \ # -------------------- PIP -------------------- - && ansible --version | grep -E '^ansible [.0-9]+$' \ - && yamllint --version 2>&1 | grep -E '[.0-9]+' \ - && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ + && 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]+' \ - && eslint -v | grep -E '[.0-9]+' \ - && grunt --version | grep -E '[.0-9]+' \ - && gulp --version | grep -E '[.0-9]+' \ - && jsonlint --version | grep -E '[.0-9]+' \ - && pm2 --no-daemon --version | grep -E '[.0-9]+' \ - && mdlint --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ - && stylelint --version | grep -E '[.0-9]+' \ - && vue --version | grep -E '[.0-9]+' \ - && webpack --version | grep -E '[.0-9]+' \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' \ + && eslint -v | grep -E '[0-9][.0-9]+' \ + && grunt --version | grep -E '[0-9][.0-9]+' \ + && gulp --version | grep -E '[0-9][.0-9]+' \ + && jsonlint --version | grep -E '[0-9][.0-9]+' \ + && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' \ + && mdlint --version | grep -E '[0-9][.0-9]+' \ + && sass --version | grep -E '[0-9][.0-9]+' \ + && stylelint --version | grep -E '[0-9][.0-9]+' \ + && vue --version | grep -E '[0-9][.0-9]+' \ + && webpack --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- GEM -------------------- - && mdl --version | grep -E '[.0-9]+' \ + && mdl --version | grep -E '[0-9][.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 0cba6b0..6d36a7d 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -90,6 +90,7 @@ RUN set -eux \ git-svn \ ghostscript \ graphviz \ + gsfonts \ hostname \ htop \ imagemagick \ @@ -109,6 +110,8 @@ RUN set -eux \ {% else %} mysql-client \ {% endif %} + mupdf \ + mupdf-tools \ nano \ net-tools \ netcat \ @@ -384,13 +387,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'] }} \ + {{ "\n\t" }}&& pip 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'] }} \ + {{ "\n\t" }}&& pip 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'] }} \ + {{ "\n\t" }}&& pip 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 6f50bb5..7e4c21c 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -346,20 +346,30 @@ extensions_available: disabled: [5.2, 5.3, 5.4, 8.0] # Only available since 5.3. 5.3 and 5.4 segfaults 5.5: type: pecl - build_dep: [libmagickwand-dev, libwebp5] - run_dep: [libmagickwand-6.q16-2, libwebp5] + build_dep: [libmagickwand-dev, libwebp5, ghostscript] + run_dep: [libmagickwand-6.q16-2, libwebp5, ghostscript] 5.6: type: pecl - run_dep: [libmagickwand-6.q16-3, libwebp6] + run_dep: [libmagickwand-6.q16-3, libwebp6, ghostscript] 7.0: type: pecl - run_dep: [libmagickwand-6.q16-3, libwebp6] + run_dep: [libmagickwand-6.q16-3, libwebp6, ghostscript] all: type: pecl - build_dep: [libmagickwand-dev, libwebp6] - run_dep: [libmagickwand-6.q16-6, libwebp-dev] + build_dep: [libmagickwand-dev, libwebp6, ghostscript] + run_dep: [libmagickwand-6.q16-6, libwebp-dev, ghostscript] # https://bugs.php.net/bug.php?id=77683 - post: sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml + # https://github.com/Imagick/imagick/issues/262 (policy prevents PDF from being read) + post: | + sed -i'' 's|.*"thread".*| |g' /etc/ImageMagick-6/policy.xml \ + && sed -i'' 's|.*algorithm)//g' redis_array_impl.c \ + && sed -i'' 's|.*sctx->cb\.no_separation.*||g' library.c \ + && sed -i'' 's|.*sctx->cb\.no_separation.*||g' redis_array_impl.c \ + && sed -i'' 's|.*sctx->cb\.no_separation.*||g' cluster_library.c \ + && sed -i'' 's|.*->no_separation.*||g' redis_array_impl.c \ && phpize \ && ./configure --enable-redis \ && make -j$(getconf _NPROCESSORS_ONLN) \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 24c458e..8a03768 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -208,22 +208,22 @@ apt_repositories_available: composer_available: asgardcms: disabled: [5.2, 5.3, 5.4, 8.0] - check: asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+' + check: asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[0-9][.0-9]+' name: asgardcms/asgardcms-installer link: asgardcms codeception: disabled: [5.2, 8.0] - check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' + check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' name: codeception/codeception link: codecept lumen: disabled: [5.2, 5.3, 5.4, 8.0] - check: lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' + check: lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' name: laravel/lumen-installer link: lumen photon: disabled: [5.2, 5.3, 5.4, 8.0] - check: photon --version | grep -E 'Installer [.0-9]+' + check: photon --version | grep -E 'Installer [0-9][.0-9]+' name: photoncms/installer link: photon prestissimo: @@ -262,7 +262,7 @@ gem_available: version: 0.9.10 mdl: name: mdl - check: mdl --version | grep -E '[.0-9]+' + check: mdl --version | grep -E '[0-9][.0-9]+' 8.0: version: 0.5.0 7.4: @@ -297,43 +297,43 @@ gem_available: npm_available: angular_cli: name: "@angular/cli" - check: ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' + check: ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' eslint: name: eslint - check: eslint -v | grep -E '[.0-9]+' + check: eslint -v | grep -E '[0-9][.0-9]+' grunt: name: grunt grunt_cli: name: grunt-cli - check: grunt --version | grep -E '[.0-9]+' + check: grunt --version | grep -E '[0-9][.0-9]+' gulp: name: gulp - check: gulp --version | grep -E '[.0-9]+' + check: gulp --version | grep -E '[0-9][.0-9]+' jsonlint: name: jsonlint - check: jsonlint --version | grep -E '[.0-9]+' + check: jsonlint --version | grep -E '[0-9][.0-9]+' pm2: name: pm2 - check: pm2 --no-daemon --version | grep -E '[.0-9]+' + check: pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' mdlint: name: mdlint - check: mdlint --version | grep -E '[.0-9]+' + check: mdlint --version | grep -E '[0-9][.0-9]+' sass: name: sass - check: sass --version | grep -E '[.0-9]+' + check: sass --version | grep -E '[0-9][.0-9]+' stylelint: name: stylelint - check: stylelint --version | grep -E '[.0-9]+' + check: stylelint --version | grep -E '[0-9][.0-9]+' vue_cli: name: "@vue/cli" - check: vue --version | grep -E '[.0-9]+' + check: vue --version | grep -E '[0-9][.0-9]+' vue_cli_service_global: name: "@vue/cli-service-global" webpack: name: webpack webpack_cli: name: webpack-cli - check: webpack --version | grep -E '[.0-9]+' + check: webpack --version | grep -E '[0-9][.0-9]+' # ------------------------------------------------------------------------------------------------- @@ -352,13 +352,13 @@ npm_available: pip_available: ansible: name: ansible - check: ansible --version | grep -E '^ansible [.0-9]+$' + check: ansible --version | grep -E '^ansible [0-9][.0-9]+$' yamllint: name: yamllint - check: yamllint --version 2>&1 | grep -E '[.0-9]+' + check: yamllint --version 2>&1 | grep -E '[0-9][.0-9]+' yq: name: yq - check: yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' + check: yq --version 2>&1 | grep -E '^yq\s+[0-9][.0-9]+$' # ------------------------------------------------------------------------------------------------- @@ -379,7 +379,7 @@ software_available: # Composer is a dependency for others composer: disabled: [5.2] - check: composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' + check: composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' all: command: curl -sS -L --fail https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer # pip is a dependency for others @@ -395,7 +395,7 @@ software_available: && curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python \ # nvm is a dependency for others nvm: - check: su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' + check: su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+' all: pre: | git clone https://github.com/creationix/nvm /opt/nvm \ @@ -415,7 +415,7 @@ software_available: && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use node' devilbox \ awesomeci: - check: regex-grep --version | grep -E '[.0-9]+' + check: regex-grep --version | grep -E '[0-9][.0-9]+' all: command: | git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \ @@ -427,7 +427,7 @@ software_available: && rm -rf /usr/local/src/awesome-ci \ deployer: disabled: [5.2, 5.3] - check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' + check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' 5.4: command: curl -sS -L --fail https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep post: chmod +x /usr/local/bin/dep @@ -496,12 +496,12 @@ software_available: && rm -rf /usr/local/src/drush9/misc \ drupalconsole: disabled: [5.2, 5.3, 5.4, 8.0] # TODO: re-enable for 8.0 (currently errors) - check: drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' + check: drupal --version | grep -E 'Drupal Console Launcher\s*[0-9][.0-9]' all: command: curl -sS -L --fail https://drupalconsole.com/installer -L -o /usr/local/bin/drupal post: chmod +x /usr/local/bin/drupal gitflow: - check: git-flow version | grep -E '[.0-9]+' + check: git-flow version | grep -E '[0-9][.0-9]+' all: command: | git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \ @@ -509,7 +509,7 @@ software_available: && make install \ && cd / && rm -rf /tmp/gitflow \ laravel: - check: laravel --version | grep -E '(Installer|version)\s*[.0-9]+' + check: laravel --version | grep -E '(Installer|version)\s*[0-9][.0-9]+' disabled: [5.2, 5.3, 8.0] 5.4: pre: | @@ -558,13 +558,13 @@ software_available: post: ln -s /usr/local/src/laravel-installer/bin/laravel /usr/local/bin/laravel linkcheck: - check: linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' + check: linkcheck --version | grep -E '^linkcheck\sv[0-9][.0-9]+' all: command: | curl -sS -L --fail https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \ && chmod +x /usr/local/bin/linkcheck \ linuxbrew: - check: su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' + check: su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[0-9][.0-9]+' all: command: | git clone https://github.com/Linuxbrew/brew.git /usr/local/src/linuxbrew \ @@ -583,7 +583,7 @@ software_available: && chmod +x mhsendmail_linux_amd64 \ && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \ mysqldumpsecure: - check: mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' + check: mysqldump-secure --version | grep -E 'Version:\s*[0-9][.0-9]+' all: command: | git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \ @@ -608,7 +608,7 @@ software_available: && rm -rf /usr/local/src/mysqldump-secure \ phalcon: disabled: [5.2, 8.0] - check: phalcon commands | grep -E '[.0-9]+' + check: phalcon commands | grep -E '[0-9][.0-9]+' 5.3: pre: | git clone https://github.com/phalcon/phalcon-devtools /usr/local/src/phalcon-devtools \ @@ -693,7 +693,7 @@ software_available: && cd / \ && rm -rf /usr/local/src/phalcon-devtools/.git \ phpcs: - check: phpcs --version | grep -E 'version [.0-9]+' + check: phpcs --version | grep -E 'version [0-9][.0-9]+' 5.2: command: | curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \ @@ -707,7 +707,7 @@ software_available: curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \ && chmod +x /usr/local/bin/phpcs \ phpcbf: - check: phpcbf --version | grep -E 'version [.0-9]+' + check: phpcbf --version | grep -E 'version [0-9][.0-9]+' 5.2: command: | curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \ @@ -741,7 +741,7 @@ software_available: && chmod +x /usr/local/bin/php-cs-fixer \ phpmd: disabled: [5.2] - check: phpmd --version | grep -E '^PHPMD [.0-9]+' + check: phpmd --version | grep -E '^PHPMD [0-9][.0-9]+' all: command: | curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \ @@ -749,7 +749,7 @@ software_available: && chmod +x /usr/local/bin/phpmd \ phpunit: disabled: [5.2, 8.0] - check: phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' + check: phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+' 5.3: command: | curl -sS -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \ @@ -776,13 +776,13 @@ software_available: && chmod +x /usr/local/bin/phpunit \ symfony: disabled: [5.2, 5.3] - check: symfony -V | grep -Ei 'version\s*.*v[.0-9]+' + check: symfony -V | grep -Ei 'version\s*.*v[0-9][.0-9]+' all: pre: SYMFONY_VERSION="$( curl -sS -L --fail https://get.symfony.com/cli/LATEST )" command: curl -sS -L --fail "https://github.com/symfony/cli/releases/download/v${SYMFONY_VERSION}/symfony_linux_amd64" > /usr/local/bin/symfony post: chmod +x /usr/local/bin/symfony wkhtmltopdf: - check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" + check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [0-9][.0-9]+\s+\(.+patched.+\)" 5.2: pre: VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" 5.3: @@ -845,7 +845,7 @@ software_available: && rm -rf /var/lib/apt/lists/* \ wpcli: disabled: [5.2] - check: wp --allow-root --version | grep -E '[.0-9]+' + check: wp --allow-root --version | grep -E '[0-9][.0-9]+' 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 diff --git a/tests/mods/modules/imagick/dummy.pdf b/tests/mods/modules/imagick/dummy.pdf new file mode 100644 index 0000000..774c2ea Binary files /dev/null and b/tests/mods/modules/imagick/dummy.pdf differ diff --git a/tests/mods/modules/imagick/imagick-pdf.php b/tests/mods/modules/imagick/imagick-pdf.php new file mode 100644 index 0000000..b4082d0 --- /dev/null +++ b/tests/mods/modules/imagick/imagick-pdf.php @@ -0,0 +1,29 @@ +=')) { + echo 'SKIP'; + exit(0); +} + +$img = new Imagick(); + +if ($img->readImage('dummy.pdf') !== True) { + echo 'FAIL: newImage()'; + exit(1); +} +echo 'OK';