From 3153b329f143f0d0410b70e4866d0685569fdf46 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 11:08:05 +0200 Subject: [PATCH 1/9] Added imagick PDF support (via ghostscript) --- Dockerfiles/mods/Dockerfile-5.5 | 2 ++ Dockerfiles/mods/Dockerfile-5.6 | 2 ++ Dockerfiles/mods/Dockerfile-7.0 | 2 ++ Dockerfiles/mods/Dockerfile-7.1 | 2 ++ Dockerfiles/mods/Dockerfile-7.2 | 2 ++ Dockerfiles/mods/Dockerfile-7.3 | 2 ++ Dockerfiles/mods/Dockerfile-7.4 | 2 ++ build/ansible/group_vars/all/mods.yml | 12 ++++----- tests/mods/modules/imagick/dummy.pdf | Bin 0 -> 13264 bytes tests/mods/modules/imagick/imagick-pdf.php | 29 +++++++++++++++++++++ 10 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 tests/mods/modules/imagick/dummy.pdf create mode 100644 tests/mods/modules/imagick/imagick-pdf.php diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index f20400a..866961a 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 \ @@ -703,6 +704,7 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + ghostscript \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 7b68d3d..c413f07 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -12,6 +12,7 @@ RUN set -eux \ alien \ firebird-dev \ freetds-dev \ + ghostscript \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -719,6 +720,7 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + ghostscript \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 649e3af..59e8e70 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -12,6 +12,7 @@ RUN set -eux \ alien \ firebird-dev \ freetds-dev \ + ghostscript \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -765,6 +766,7 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + ghostscript \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 5b963b5..a5dd0e0 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -12,6 +12,7 @@ RUN set -eux \ alien \ firebird-dev \ freetds-dev \ + ghostscript \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -774,6 +775,7 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + ghostscript \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 1094664..f75a1d0 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -12,6 +12,7 @@ RUN set -eux \ alien \ firebird-dev \ freetds-dev \ + ghostscript \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -778,6 +779,7 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + ghostscript \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index fdd34c7..4167ffa 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -12,6 +12,7 @@ RUN set -eux \ alien \ firebird-dev \ freetds-dev \ + ghostscript \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -778,6 +779,7 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + ghostscript \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index fd94176..6021413 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -12,6 +12,7 @@ RUN set -eux \ alien \ firebird-dev \ freetds-dev \ + ghostscript \ libaio-dev \ libbz2-dev \ libc-client-dev \ @@ -733,6 +734,7 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ + ghostscript \ libaio1 \ libaspell15 \ libc-client2007e \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 6f50bb5..5f48887 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -346,18 +346,18 @@ 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 imap: diff --git a/tests/mods/modules/imagick/dummy.pdf b/tests/mods/modules/imagick/dummy.pdf new file mode 100644 index 0000000000000000000000000000000000000000..774c2ea70c55104973794121eae56bcad918da97 GIT binary patch literal 13264 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 literal 0 HcmV?d00001 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'; From acea0ac0fe524ed13d8ad958966a79bf983390a2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 11:09:19 +0200 Subject: [PATCH 2/9] Fixed Ansible installation --- Dockerfiles/work/Dockerfile-5.2 | 6 +++--- Dockerfiles/work/Dockerfile-5.3 | 6 +++--- Dockerfiles/work/Dockerfile-5.4 | 6 +++--- Dockerfiles/work/Dockerfile-5.5 | 6 +++--- Dockerfiles/work/Dockerfile-5.6 | 6 +++--- Dockerfiles/work/Dockerfile-7.0 | 6 +++--- Dockerfiles/work/Dockerfile-7.1 | 6 +++--- Dockerfiles/work/Dockerfile-7.2 | 6 +++--- Dockerfiles/work/Dockerfile-7.3 | 6 +++--- Dockerfiles/work/Dockerfile-7.4 | 6 +++--- Dockerfiles/work/Dockerfile-8.0 | 6 +++--- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index c2d5d4c..b79b81b 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -384,13 +384,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 \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 8f979ff..1dd427a 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -440,13 +440,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 \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index aa56137..20b2b7b 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -474,13 +474,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 \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 9903461..6c51c7f 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -491,13 +491,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 \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index ddb8b65..a7b8c9f 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -502,13 +502,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 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index dd7ec1b..bc3a1ab 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -502,13 +502,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 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 10c7b74..c5e20ea 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -502,13 +502,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 \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 1b97bc6..6dafd86 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -503,13 +503,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 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 2f8336f..bab8af2 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -503,13 +503,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 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index d430729..6fb009b 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -498,13 +498,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 \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 8f901ec..d481e12 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -403,13 +403,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 \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 0cba6b0..28ea9db 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -384,13 +384,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 -%} From 2701a524b9ab0a34df6a23696bfffc6bca358868 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 11:10:22 +0200 Subject: [PATCH 3/9] Fixed MongoDB module for PHP 5.6 --- Dockerfiles/mods/Dockerfile-5.6 | 4 ++-- build/ansible/group_vars/all/mods.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index c413f07..8cb1b30 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -321,10 +321,10 @@ RUN set -eux \ # -------------------- Installing PHP Extension: mongodb -------------------- RUN set -eux \ - # Installation: Generic + # Installation: Version specific # Type: PECL extension # Default: Pecl command - && pecl install mongodb \ + && pecl install mongodb-1.7.5 \ # Enabling && docker-php-ext-enable mongodb \ && true diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 5f48887..b9f0742 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -516,6 +516,9 @@ extensions_available: 5.5: type: pecl version: 1.5.5 + 5.6: + type: pecl + version: 1.7.5 8.0: type: git git_url: https://github.com/mongodb/mongo-php-driver From 9c5326dc0f21e574a566f85a8527a86040bdc07d Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 11:11:35 +0200 Subject: [PATCH 4/9] Stricter version check for installed tools --- Dockerfiles/work/Dockerfile-5.2 | 48 ++++++++--------- Dockerfiles/work/Dockerfile-5.3 | 60 +++++++++++----------- Dockerfiles/work/Dockerfile-5.4 | 66 ++++++++++++------------ Dockerfiles/work/Dockerfile-5.5 | 74 +++++++++++++-------------- Dockerfiles/work/Dockerfile-5.6 | 74 +++++++++++++-------------- Dockerfiles/work/Dockerfile-7.0 | 74 +++++++++++++-------------- Dockerfiles/work/Dockerfile-7.1 | 74 +++++++++++++-------------- Dockerfiles/work/Dockerfile-7.2 | 74 +++++++++++++-------------- Dockerfiles/work/Dockerfile-7.3 | 74 +++++++++++++-------------- Dockerfiles/work/Dockerfile-7.4 | 74 +++++++++++++-------------- Dockerfiles/work/Dockerfile-8.0 | 58 ++++++++++----------- build/ansible/group_vars/all/work.yml | 74 +++++++++++++-------------- 12 files changed, 412 insertions(+), 412 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index b79b81b..0dde0c6 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -443,38 +443,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 1dd427a..6bcf788 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -499,46 +499,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 20b2b7b..0f39576 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -533,50 +533,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 6c51c7f..4ae7534 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -550,54 +550,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 a7b8c9f..bf40718 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -561,55 +561,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 bc3a1ab..a0e7100 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -561,55 +561,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 c5e20ea..24d82f9 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -561,55 +561,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 6dafd86..69cfa92 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -562,55 +562,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 bab8af2..1a0ffee 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -562,55 +562,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 6fb009b..5080c13 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -557,54 +557,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 d481e12..0d42578 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -462,43 +462,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/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 From ce4f022c70284e671f224bf8b8247dfbe3c476c6 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 11:12:20 +0200 Subject: [PATCH 5/9] Update CHANGELOG --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3983653..7a9d7fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ ## Unreleased +## Release 0.108 + +#### Added +- Added ghostscript +- Added imagick PDF support (via ghostscript) + +#### Fixed +- Fixes Ansible installation +- Fixes MongoDB for PHP 5.6 + +#### Changed +- Stricter version check for installed tools + + ## Release 0.107 #### Fixed From c06a3d22377145d41cd25843524ddd696d84e363 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 12:02:04 +0200 Subject: [PATCH 6/9] Fix Redis for PHP 8.0 --- Dockerfiles/mods/Dockerfile-8.0 | 4 ++++ build/ansible/group_vars/all/mods.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index dd976a4..7c90953 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -323,6 +323,10 @@ RUN set -eux \ && git checkout $(git for-each-ref --format='%(refname)' refs/tags | grep -E 'tags/[.0-9]+$' | sed 's|.*tags/||g' | sort -V | tail -1) \ # Custom: Install command && sed -i'' 's/, ZSTR_LEN(ra->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/mods.yml b/build/ansible/group_vars/all/mods.yml index b9f0742..e2fbcbb 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -833,6 +833,10 @@ extensions_available: # TODO: This is a nasty work-around to fix current phpredis implementation for PHP 8.0 command: | sed -i'' 's/, ZSTR_LEN(ra->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) \ From b2476e385138bfd4920966e5fde1df0af6e6541f Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 12:02:39 +0200 Subject: [PATCH 7/9] Add gsfonts, mupdf and mupdf-tools --- Dockerfiles/work/Dockerfile-5.2 | 3 +++ Dockerfiles/work/Dockerfile-5.3 | 3 +++ Dockerfiles/work/Dockerfile-5.4 | 3 +++ Dockerfiles/work/Dockerfile-5.5 | 3 +++ Dockerfiles/work/Dockerfile-5.6 | 3 +++ Dockerfiles/work/Dockerfile-7.0 | 3 +++ Dockerfiles/work/Dockerfile-7.1 | 3 +++ Dockerfiles/work/Dockerfile-7.2 | 3 +++ Dockerfiles/work/Dockerfile-7.3 | 3 +++ Dockerfiles/work/Dockerfile-7.4 | 3 +++ Dockerfiles/work/Dockerfile-8.0 | 3 +++ build/ansible/DOCKERFILES/Dockerfile-work.j2 | 3 +++ 12 files changed, 36 insertions(+) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 0dde0c6..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 \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 6bcf788..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 \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 0f39576..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 \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 4ae7534..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 \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index bf40718..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 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index a0e7100..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 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 24d82f9..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 \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 69cfa92..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 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 1a0ffee..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 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 5080c13..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 \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 0d42578..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 \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 28ea9db..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 \ From c8bd21ebbe5e328044670071f6de581c7132f839 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 12:03:13 +0200 Subject: [PATCH 8/9] Update CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a9d7fc..1fe9cc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,11 +8,14 @@ #### 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 #### Changed - Stricter version check for installed tools From dc438b0aad39b913250073b9d1926a1c86a21eba Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 12:16:37 +0200 Subject: [PATCH 9/9] Fixes policy.xml for Imagick --- CHANGELOG.md | 1 + Dockerfiles/mods/Dockerfile-5.5 | 20 +++++++++++++++++++- Dockerfiles/mods/Dockerfile-5.6 | 20 +++++++++++++++++++- Dockerfiles/mods/Dockerfile-7.0 | 20 +++++++++++++++++++- Dockerfiles/mods/Dockerfile-7.1 | 20 +++++++++++++++++++- Dockerfiles/mods/Dockerfile-7.2 | 20 +++++++++++++++++++- Dockerfiles/mods/Dockerfile-7.3 | 20 +++++++++++++++++++- Dockerfiles/mods/Dockerfile-7.4 | 20 +++++++++++++++++++- build/ansible/group_vars/all/mods.yml | 12 +++++++++++- 9 files changed, 145 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe9cc7..fbf8544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - 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 diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 866961a..a159537 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -207,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|.*|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|.*