diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 811f74d..9eced08 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -526,7 +526,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 8885c6a..5df2770 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -564,7 +564,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 6cdc0ed..757056d 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -578,7 +578,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 6aecd66..064ee13 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -591,7 +591,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index d82548c..6403e42 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -572,7 +572,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index c8c8837..34f7a35 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -571,7 +571,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 6637087..91c5274 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -591,7 +591,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 7e7f772..5da30e0 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -592,7 +592,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 2a39b86..43e68af 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -592,7 +592,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index e686991..a5dd6ab 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -511,7 +511,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 20d594a..139c91d 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -511,7 +511,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 8986163..0962840 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -495,7 +495,7 @@ RUN set -eux \ RUN set -eux \ # -------------------- Software -------------------- - && composer --version 2>/dev/null | grep -E 'version\s*[0-9][.0-9]+' \ + && composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \ \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 126f63d..6a03a70 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -414,7 +414,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][.0-9]+' + check: composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' all: command: | curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \