From b943b30b012fbf5dc9fe106f93974812ecd30239 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 19 Apr 2019 12:03:57 +0200 Subject: [PATCH] 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]+'