From 2df2b8c7eb3e6f807e5133cdc28c6222958b077f Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 19 Apr 2019 12:03:08 +0200 Subject: [PATCH 1/3] Add tool: Laravel Lumen cli --- Dockerfiles/work/Dockerfile-5.5 | 5 +++++ Dockerfiles/work/Dockerfile-5.6 | 5 +++++ Dockerfiles/work/Dockerfile-7.0 | 5 +++++ Dockerfiles/work/Dockerfile-7.1 | 5 +++++ Dockerfiles/work/Dockerfile-7.2 | 5 +++++ Dockerfiles/work/Dockerfile-7.3 | 5 +++++ Dockerfiles/work/Dockerfile-7.4 | 5 +++++ build/ansible/group_vars/all/work.yml | 8 ++++++++ 8 files changed, 43 insertions(+) diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index a13097b..8db1aa8 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -224,6 +224,10 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ +&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ + \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -478,6 +482,7 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 43042f0..e22a029 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -236,6 +236,10 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ +&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ + \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -491,6 +495,7 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 7f79e8d..3518af4 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -236,6 +236,10 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ +&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ + \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -491,6 +495,7 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index d03ae8d..f534c94 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -236,6 +236,10 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ +&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ + \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -491,6 +495,7 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index a35968c..4d64895 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -236,6 +236,10 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ +&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ + \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -491,6 +495,7 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phalcon commands | grep -E '[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index e354c0c..0f2b398 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -236,6 +236,10 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ +&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ + \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -480,6 +484,7 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index fbf3b5a..f1bc3d2 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -236,6 +236,10 @@ RUN set -x \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ \ +# lumen + && COMPOSER_HOME="/usr/local/src/composer" composer global require laravel/lumen-installer \ +&& ln -s /usr/local/src/composer/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ + \ # mhsendmail && wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \ && chmod +x mhsendmail_linux_amd64 \ @@ -476,6 +480,7 @@ RUN set -x \ && laravel --version | grep -E '(Installer|version)\s*[.0-9]+' \ && linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \ + && lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' \ && mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \ && phpcs --version | grep -E 'version [.0-9]+' \ && phpcbf --version | grep -E 'version [.0-9]+' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index eb091fa..7942cad 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -85,6 +85,7 @@ software_enabled: - laravel - linkcheck - linuxbrew + - lumen - mhsendmail - mysqldumpsecure - phalcon @@ -492,6 +493,13 @@ software_available: && v="${BASH_PROFILE}" su ${MY_USER} -c -p \ 'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \ && su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \ + lumen: + disabled: [5.2, 5.3, 5.4, 8.0] + check: lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[.0-9]+$' + all: + command: | + COMPOSER_HOME="{{ compose_home }}" composer global require laravel/lumen-installer \ + && ln -s {{ compose_home }}/vendor/laravel/lumen-installer/lumen /usr/local/bin/lumen \ mhsendmail: all: command: | From b943b30b012fbf5dc9fe106f93974812ecd30239 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 19 Apr 2019 12:03:57 +0200 Subject: [PATCH 2/3] Add tool: Angular CLI --- Dockerfiles/work/Dockerfile-5.2 | 3 +++ Dockerfiles/work/Dockerfile-5.3 | 3 +++ Dockerfiles/work/Dockerfile-5.4 | 3 +++ Dockerfiles/work/Dockerfile-5.5 | 3 +++ Dockerfiles/work/Dockerfile-5.6 | 3 +++ Dockerfiles/work/Dockerfile-7.0 | 3 +++ Dockerfiles/work/Dockerfile-7.1 | 3 +++ Dockerfiles/work/Dockerfile-7.2 | 3 +++ Dockerfiles/work/Dockerfile-7.3 | 3 +++ Dockerfiles/work/Dockerfile-7.4 | 3 +++ Dockerfiles/work/Dockerfile-8.0 | 3 +++ build/ansible/group_vars/all/work.yml | 4 ++++ 12 files changed, 37 insertions(+) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 65eff99..e1fed60 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -260,6 +260,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -397,6 +399,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 71927f1..b45b981 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -301,6 +301,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -445,6 +447,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index c0e0c97..54c9652 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -330,6 +330,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -478,6 +480,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 8db1aa8..8dceffb 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -345,6 +345,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -497,6 +499,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index e22a029..972c01e 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -357,6 +357,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -510,6 +512,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 3518af4..c8f9ca3 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -357,6 +357,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -510,6 +512,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index f534c94..d1b1e16 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -357,6 +357,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -510,6 +512,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 4d64895..65ddab2 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -357,6 +357,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -510,6 +512,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 0f2b398..d0c1ef4 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -346,6 +346,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -498,6 +500,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index f1bc3d2..c66693f 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -342,6 +342,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -493,6 +495,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 6bbab6a..e82a7f1 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -273,6 +273,8 @@ RUN set -x \ ### Install Node npm packages (globally) ### RUN set -x \ +# angular_cli + && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint && su -c '. /opt/nvm/nvm.sh; npm install -g eslint' devilbox \ # grunt @@ -415,6 +417,7 @@ RUN set -x \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ \ + && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ && grunt --version | grep -E '[.0-9]+' \ && gulp --version | grep -E '[.0-9]+' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 7942cad..fea9a6f 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -42,6 +42,7 @@ gem_enabled: # Node npm packages to install # ------------------------------------------------------------------------------------------------- npm_enabled: + - angular_cli - eslint - grunt - grunt_cli @@ -216,6 +217,9 @@ pip_available: # version: [optional] Specific version of Node npm package # npm_available: + angular_cli: + name: "@angular/cli" + check: ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' eslint: name: eslint check: eslint -v | grep -E '[.0-9]+' From 4b21c70b8f67eec2d2c126036b53a83f1beca98a Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 19 Apr 2019 12:17:58 +0200 Subject: [PATCH 3/3] Fix RDKAFKA module --- Dockerfiles/mods/Dockerfile-5.3 | 2 +- Dockerfiles/mods/Dockerfile-5.4 | 2 +- Dockerfiles/mods/Dockerfile-5.5 | 2 +- build/ansible/group_vars/all/mods.yml | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 146863c..dc192fa 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -336,7 +336,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ # ---- Installing PHP Extension: rdkafka ---- - && pecl install rdkafka \ + && pecl install rdkafka-3.0.5 \ && docker-php-ext-enable rdkafka \ && (rm -rf /usr/local/lib/php/test/rdkafka || true) \ && (rm -rf /usr/local/lib/php/doc/rdkafka || true) \ diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 2566f0a..3790ed7 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -341,7 +341,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ # ---- Installing PHP Extension: rdkafka ---- - && pecl install rdkafka \ + && pecl install rdkafka-3.0.5 \ && docker-php-ext-enable rdkafka \ && (rm -rf /usr/local/lib/php/test/rdkafka || true) \ && (rm -rf /usr/local/lib/php/doc/rdkafka || true) \ diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index f4fc4f6..cce04ce 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -335,7 +335,7 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/redis || true) \ \ # ---- Installing PHP Extension: rdkafka ---- - && pecl install rdkafka \ + && pecl install rdkafka-3.0.5 \ && docker-php-ext-enable rdkafka \ && (rm -rf /usr/local/lib/php/test/rdkafka || true) \ && (rm -rf /usr/local/lib/php/doc/rdkafka || true) \ diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 9f00768..0cdb671 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -764,6 +764,15 @@ extensions_available: already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0] rdkafka: disabled: [5.2, 8.0] + 5.3: + type: pecl + version: 3.0.5 + 5.4: + type: pecl + version: 3.0.5 + 5.5: + type: pecl + version: 3.0.5 all: type: pecl build_dep: [librdkafka-dev]