From 30c3118a22465f1e244b35872bf48607b191df7a Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 9 Dec 2022 11:12:08 +0100 Subject: [PATCH] Backport more tools --- .ansible/DOCKERFILES/Dockerfile-work.j2 | 2 +- .ansible/group_vars/all/work.yml | 11 +++++-- Dockerfiles/work/Dockerfile-5.2 | 38 ++++++++++++++-------- Dockerfiles/work/Dockerfile-5.3 | 38 ++++++++++++++-------- Dockerfiles/work/Dockerfile-5.4 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-5.5 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-5.6 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-7.0 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-7.1 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-7.2 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-7.3 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-7.4 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-8.0 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-8.1 | 42 ++++++++++++++++--------- Dockerfiles/work/Dockerfile-8.2 | 42 ++++++++++++++++--------- doc/available-tools.md | 2 ++ php_tools/laravel-installer/install.yml | 2 +- php_tools/mupdf-tools/install.yml | 2 +- php_tools/vim/README.md | 7 +++++ php_tools/vim/install.yml | 7 +++++ php_tools/vim/options.yml | 11 +++++++ 21 files changed, 386 insertions(+), 196 deletions(-) create mode 100644 php_tools/vim/README.md create mode 100644 php_tools/vim/install.yml create mode 100644 php_tools/vim/options.yml diff --git a/.ansible/DOCKERFILES/Dockerfile-work.j2 b/.ansible/DOCKERFILES/Dockerfile-work.j2 index 3983ea1..8aba7fa 100644 --- a/.ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/.ansible/DOCKERFILES/Dockerfile-work.j2 @@ -313,7 +313,7 @@ RUN set -eux \ {%- set npm_package = fn.tool_npm_get_package(php_version, tool, tools_available) -%} {%- set npm_version = fn.tool_npm_get_version(php_version, tool, tools_available) -%} {%- set npm_binary = fn.tool_npm_get_binary(php_version, tool, tools_available) -%} - {{ "\n\t" }}&& su -c '. {{ nvm_home }}/nvm.sh; npm install -g --force {{ npm_package }}{{ npm_version }}' devilbox \ + {{ "\n\t" }}&& su -c '. {{ nvm_home }}/nvm.sh; npm install --location=global {{ npm_package }}{{ npm_version }}' devilbox \ {%- if npm_binary | length -%} {{ "\n\t" }}&& ln -s {{ nvm_home }}/versions/node/$(su -c '. {{ nvm_home }}/nvm.sh; node --version' devilbox)/bin/{{ npm_binary }} /usr/local/bin/ \ {%- endif -%} diff --git a/.ansible/group_vars/all/work.yml b/.ansible/group_vars/all/work.yml index 627c70d..d9d35f3 100644 --- a/.ansible/group_vars/all/work.yml +++ b/.ansible/group_vars/all/work.yml @@ -38,6 +38,7 @@ tools_enabled: - svn - symfony-cli - tig + - vim - vue-cli - webpack-cli - wp-cli @@ -249,7 +250,7 @@ tools_available: package: jq laravel-installer: disabled: [5.2, 5.3] - check: laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) + check: laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) all: type: composer composer: 2 @@ -322,7 +323,7 @@ tools_available: check: | echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ all: @@ -570,6 +571,12 @@ tools_available: all: type: apt package: tig + vim: + disabled: [] + check: vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) + all: + type: apt + package: vim vue-cli: disabled: [] check: vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 6e188de..2ee61fb 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -243,6 +243,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -252,14 +253,14 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -271,7 +272,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -309,14 +310,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -335,7 +336,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -344,7 +345,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -368,7 +369,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -393,7 +394,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -405,7 +406,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -426,16 +427,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -500,6 +506,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -611,7 +618,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -677,6 +684,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 78bfa5d..92908e2 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -277,6 +277,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -286,14 +287,14 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -305,7 +306,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -343,14 +344,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -369,7 +370,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -378,7 +379,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -431,7 +432,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -456,7 +457,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -468,7 +469,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -489,16 +490,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -571,6 +577,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -682,7 +689,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -763,6 +770,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index a2a2b4a..052241d 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -277,6 +277,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -286,14 +287,14 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -305,7 +306,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -358,14 +359,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -380,7 +381,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer:1.3.7 \ && ln -s /usr/local/src/composer/vendor/laravel/installer/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (custom) linkcheck -------------------- @@ -392,7 +393,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -401,7 +402,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -454,7 +455,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -479,7 +480,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -491,7 +492,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -512,16 +513,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -594,6 +600,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -703,7 +710,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (custom) linkcheck -------------------- @@ -720,7 +727,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -801,6 +808,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 1b578a0..330a5c2 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -277,6 +277,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -286,7 +287,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -301,7 +302,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -313,7 +314,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer:2.2.0 \ && ln -s /usr/local/src/composer/vendor/laravel/installer/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 7a4706a..fd3cbc7 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -277,6 +277,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -286,7 +287,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -301,7 +302,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -313,7 +314,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer:2.2.0 \ && ln -s /usr/local/src/composer/vendor/laravel/installer/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index b0d7d25..02c62b7 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -277,6 +277,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -286,7 +287,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -301,7 +302,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -313,7 +314,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer:2.2.0 \ && ln -s /usr/local/src/composer/vendor/laravel/installer/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 88d203b..3392289 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -277,6 +277,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -286,7 +287,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -301,7 +302,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -313,7 +314,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer:2.3.0 \ && ln -s /usr/local/src/composer/vendor/laravel/installer/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 1f20261..e73dc03 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -277,6 +277,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -286,7 +287,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -301,7 +302,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -313,7 +314,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer:4.0.0 \ && ln -s /usr/local/src/composer/vendor/laravel/installer/bin/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 72152ac..a7fb71c 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -279,6 +279,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -288,7 +289,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -303,7 +304,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -315,7 +316,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer \ && ln -s /usr/local/src/composer/vendor/laravel/installer/bin/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 9cb8554..2f929b2 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -279,6 +279,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -288,7 +289,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -303,7 +304,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -315,7 +316,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer \ && ln -s /usr/local/src/composer/vendor/laravel/installer/bin/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 7cc445e..e046ef3 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -279,6 +279,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -288,7 +289,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -303,7 +304,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -315,7 +316,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer \ && ln -s /usr/local/src/composer/vendor/laravel/installer/bin/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 4fb8edb..26f6941 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -279,6 +279,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -288,7 +289,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -303,7 +304,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -315,7 +316,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer \ && ln -s /usr/local/src/composer/vendor/laravel/installer/bin/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -509,7 +510,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -534,7 +535,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -546,7 +547,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -567,16 +568,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -649,6 +655,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -763,7 +770,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -785,7 +792,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -888,6 +895,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 5408d96..602d39f 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -279,6 +279,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -288,7 +289,7 @@ RUN set -eux \ # -------------------- (npm) angular-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \ && true @@ -303,7 +304,7 @@ RUN set -eux \ # -------------------- (npm) eslint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \ && eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \ && true @@ -315,7 +316,7 @@ RUN set -eux \ # -------------------- (npm) jsonlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \ && jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \ && true @@ -366,14 +367,14 @@ RUN set -eux \ # -------------------- (npm) grunt-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \ && grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \ && true # -------------------- (npm) gulp -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \ && gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \ && true @@ -388,7 +389,7 @@ RUN set -eux \ && COMPOSER_HOME="/usr/local/src/composer" COMPOSER_MEMORY_LIMIT=-1 /usr/local/bin/composer-2 global require --no-interaction --no-cache laravel/installer \ && ln -s /usr/local/src/composer/vendor/laravel/installer/bin/laravel /usr/local/bin/ \ && rm -rf /usr/local/src/composer/cache/* \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -408,7 +409,7 @@ RUN set -eux \ # -------------------- (npm) mdlint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \ && mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \ && true @@ -417,7 +418,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -462,7 +463,7 @@ RUN set -eux \ # -------------------- (npm) pm2 -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \ && pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \ && true @@ -487,7 +488,7 @@ RUN set -eux \ # -------------------- (npm) sass -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \ && sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \ && true @@ -499,7 +500,7 @@ RUN set -eux \ # -------------------- (npm) stylelint -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \ && stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \ && true @@ -520,16 +521,21 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ && true # -------------------- (npm) webpack-cli -------------------- RUN set -eux \ - && su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \ + && su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \ && ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \ && webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \ && true @@ -602,6 +608,7 @@ RUN set -eux \ shellcheck \ subversion \ tig \ + vim \ zsh \ && rm -rf /var/lib/apt/lists/* @@ -716,7 +723,7 @@ RUN set -eux \ # -------------------- (composer) laravel-installer -------------------- RUN set -eux \ - && laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ + && laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) \ && true # -------------------- (composer) laravel-lumen -------------------- @@ -738,7 +745,7 @@ RUN set -eux \ RUN set -eux \ && echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ \ @@ -814,6 +821,11 @@ RUN set -eux \ && tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \ && true +# -------------------- (apt) vim -------------------- +RUN set -eux \ + && vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \ + && true + # -------------------- (npm) vue-cli -------------------- RUN set -eux \ && vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \ diff --git a/doc/available-tools.md b/doc/available-tools.md index 41896cf..d0d891e 100644 --- a/doc/available-tools.md +++ b/doc/available-tools.md @@ -289,6 +289,7 @@ Additionally to all of the `slim` tools shown above, the following PHP cli tools | [svn][lnk_svn] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [symfony-cli][lnk_symfony-cli] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [tig][lnk_tig] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| [vim][lnk_vim] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [vue-cli][lnk_vue-cli] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [webpack-cli][lnk_webpack-cli] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [wp-cli][lnk_wp-cli] | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | @@ -337,6 +338,7 @@ Additionally to all of the `slim` tools shown above, the following PHP cli tools [lnk_svn]: ../php_tools/svn [lnk_symfony-cli]: ../php_tools/symfony-cli [lnk_tig]: ../php_tools/tig +[lnk_vim]: ../php_tools/vim [lnk_vue-cli]: ../php_tools/vue-cli [lnk_webpack-cli]: ../php_tools/webpack-cli [lnk_wp-cli]: ../php_tools/wp-cli diff --git a/php_tools/laravel-installer/install.yml b/php_tools/laravel-installer/install.yml index fe84b63..820c61b 100644 --- a/php_tools/laravel-installer/install.yml +++ b/php_tools/laravel-installer/install.yml @@ -1,6 +1,6 @@ --- -check: laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) +check: laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false) all: type: composer diff --git a/php_tools/mupdf-tools/install.yml b/php_tools/mupdf-tools/install.yml index 1013d6b..98f6435 100644 --- a/php_tools/mupdf-tools/install.yml +++ b/php_tools/mupdf-tools/install.yml @@ -3,7 +3,7 @@ check: | echo test > test.txt \ && mutool create -o test.pdf test.txt \ - && file test.pdf | gre 'PDF document' \ + && file test.pdf | grep 'PDF document' \ && rm test.txt \ && rm test.pdf \ diff --git a/php_tools/vim/README.md b/php_tools/vim/README.md new file mode 100644 index 0000000..5edac07 --- /dev/null +++ b/php_tools/vim/README.md @@ -0,0 +1,7 @@ +# Vim + +Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient. + +| Platform | Url | +|----------|------------------------------------------------------------------| +| Website | https://www.vim.org/ | diff --git a/php_tools/vim/install.yml b/php_tools/vim/install.yml new file mode 100644 index 0000000..8551ab0 --- /dev/null +++ b/php_tools/vim/install.yml @@ -0,0 +1,7 @@ +--- + +check: vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) + +all: + type: apt + package: vim diff --git a/php_tools/vim/options.yml b/php_tools/vim/options.yml new file mode 100644 index 0000000..d2ccf48 --- /dev/null +++ b/php_tools/vim/options.yml @@ -0,0 +1,11 @@ +--- + +# The name of the module +name: vim + +# Exclude module build/installation for the following PHP versions +exclude: [] + +# In order for this tool to build/install correctly, +# the following tools must have been installed first. +depends: []