From 58ecd35153d8cdc6e8d3fc661723a9279ab13a39 Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 8 Jan 2020 13:30:08 +0100 Subject: [PATCH 1/3] Fixes #123 Replace Ruby Sass with Dart Sass --- Dockerfiles/work/Dockerfile-5.2 | 8 ++++---- Dockerfiles/work/Dockerfile-5.3 | 8 ++++---- Dockerfiles/work/Dockerfile-5.4 | 8 ++++---- Dockerfiles/work/Dockerfile-5.5 | 8 ++++---- Dockerfiles/work/Dockerfile-5.6 | 8 ++++---- Dockerfiles/work/Dockerfile-7.0 | 8 ++++---- Dockerfiles/work/Dockerfile-7.1 | 8 ++++---- Dockerfiles/work/Dockerfile-7.2 | 8 ++++---- Dockerfiles/work/Dockerfile-7.3 | 8 ++++---- Dockerfiles/work/Dockerfile-7.4 | 8 ++++---- Dockerfiles/work/Dockerfile-8.0 | 8 ++++---- build/ansible/group_vars/all/work.yml | 8 ++++---- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 382f516e..38856cae 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -321,6 +321,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -363,9 +366,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -465,12 +465,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index b2704a23..cbb05e8d 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -377,6 +377,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -419,9 +422,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -529,12 +529,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index de091af8..88f3baa4 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -411,6 +411,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -453,9 +456,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -567,12 +567,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index f9286879..79d83073 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -428,6 +428,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -470,9 +473,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -588,12 +588,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 3f847121..b5ac681f 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -441,6 +441,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -483,9 +486,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -602,12 +602,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 3e8ade4e..175643df 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -441,6 +441,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -483,9 +486,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -602,12 +602,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index f060f530..8fbdda62 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -441,6 +441,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -483,9 +486,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -602,12 +602,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 070c951a..e87413cc 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -442,6 +442,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -484,9 +487,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -603,12 +603,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 4a4996fd..c56b917f 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -428,6 +428,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -470,9 +473,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -588,12 +588,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index a3eb80f1..8dc190af 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -423,6 +423,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -465,9 +468,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -582,12 +582,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 61b882d3..5ab8e713 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -342,6 +342,9 @@ RUN set -eux \ # -------------------- mdlint -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \ \ +# -------------------- sass -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -384,9 +387,6 @@ RUN set -eux \ # -------------------- scss_lint -------------------- && gem install scss_lint -v 0.57.1 \ \ -# -------------------- sass -------------------- - && gem install sass \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -491,12 +491,12 @@ RUN set -eux \ && jsonlint --version | grep -E '[.0-9]+' \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ + && sass --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ # -------------------- GEM -------------------- && mdl --version | grep -E '[.0-9]+' \ - && sass --version | grep -E '[.0-9]+' \ \ # -------------------- Cleanup -------------------- && rm -rf /home/devilbox/.cache/ \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index 12fe993c..b2ec0a48 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -46,7 +46,6 @@ gem_enabled: - rb_inotify - mdl - scss_lint - - sass # ------------------------------------------------------------------------------------------------- @@ -62,6 +61,7 @@ npm_enabled: # https://github.com/Unitech/pm2 - pm2 - mdlint + - sass - vue_cli - vue_cli_service_global - webpack @@ -275,9 +275,6 @@ gem_available: name: scss_lint all: version: 0.57.1 - sass: - name: sass - check: sass --version | grep -E '[.0-9]+' # ------------------------------------------------------------------------------------------------- @@ -317,6 +314,9 @@ npm_available: mdlint: name: mdlint check: mdlint --version | grep -E '[.0-9]+' + sass: + name: sass + check: sass --version | grep -E '[.0-9]+' vue_cli: name: "@vue/cli" check: vue --version | grep -E '[.0-9]+' From 8bef4c7167feb923fa7439d915bf2cae4c9ddf34 Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 8 Jan 2020 13:30:40 +0100 Subject: [PATCH 2/3] Fixes #144 Adding CHANGELOG --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..df4d88d6 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,13 @@ +# Changelog + + +## Unreleased + + +## Release 0.102 + +#### Added +- [#144](https://github.com/devilbox/docker-php-fpm/issues/144) Added CHANGELOG + +#### Changed +- [#123](https://github.com/devilbox/docker-php-fpm/issues/123) Added Dart Sass and removed Ruby Sass From 64c41f778642f9957f0b97894ad4c36f9fdfbd78 Mon Sep 17 00:00:00 2001 From: cytopia Date: Wed, 8 Jan 2020 15:44:08 +0100 Subject: [PATCH 3/3] Replace scss-lint with stylelint --- CHANGELOG.md | 1 + Dockerfiles/work/Dockerfile-5.2 | 7 ++++--- Dockerfiles/work/Dockerfile-5.3 | 7 ++++--- Dockerfiles/work/Dockerfile-5.4 | 7 ++++--- Dockerfiles/work/Dockerfile-5.5 | 7 ++++--- Dockerfiles/work/Dockerfile-5.6 | 7 ++++--- Dockerfiles/work/Dockerfile-7.0 | 7 ++++--- Dockerfiles/work/Dockerfile-7.1 | 7 ++++--- Dockerfiles/work/Dockerfile-7.2 | 7 ++++--- Dockerfiles/work/Dockerfile-7.3 | 7 ++++--- Dockerfiles/work/Dockerfile-7.4 | 7 ++++--- Dockerfiles/work/Dockerfile-8.0 | 7 ++++--- build/ansible/group_vars/all/work.yml | 9 ++++----- 13 files changed, 49 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df4d88d6..6559ebe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,3 +11,4 @@ #### Changed - [#123](https://github.com/devilbox/docker-php-fpm/issues/123) Added Dart Sass and removed Ruby Sass +- Replace [scss-lint](https://github.com/sds/scss-lint) with [stylelint](https://github.com/stylelint/stylelint) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 38856cae..5563482b 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -324,6 +324,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -363,9 +366,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -466,6 +466,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index cbb05e8d..6bba280e 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -380,6 +380,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -419,9 +422,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -530,6 +530,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 88f3baa4..ad3493ca 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -414,6 +414,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -453,9 +456,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -568,6 +568,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 79d83073..f9a9c6cf 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -431,6 +431,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -470,9 +473,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -589,6 +589,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index b5ac681f..2be6b374 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -444,6 +444,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -483,9 +486,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -603,6 +603,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 175643df..bf2beba4 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -444,6 +444,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -483,9 +486,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -603,6 +603,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 8fbdda62..99eca853 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -444,6 +444,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -483,9 +486,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -603,6 +603,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index e87413cc..8fdc5729 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -445,6 +445,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -484,9 +487,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -604,6 +604,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index c56b917f..99f5a114 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -431,6 +431,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -470,9 +473,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -589,6 +589,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 8dc190af..aa21c849 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -426,6 +426,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -465,9 +468,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -583,6 +583,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 5ab8e713..d6f37846 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -345,6 +345,9 @@ RUN set -eux \ # -------------------- sass -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \ \ +# -------------------- stylelint -------------------- + && su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \ + \ # -------------------- vue_cli -------------------- && su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \ \ @@ -384,9 +387,6 @@ RUN set -eux \ # -------------------- mdl -------------------- && gem install mdl -v 0.5.0 \ \ -# -------------------- scss_lint -------------------- - && gem install scss_lint -v 0.57.1 \ - \ \ && rm -rf /root/.gem \ && rm -rf /tmp/* \ @@ -492,6 +492,7 @@ RUN set -eux \ && pm2 --no-daemon --version | grep -E '[.0-9]+' \ && mdlint --version | grep -E '[.0-9]+' \ && sass --version | grep -E '[.0-9]+' \ + && stylelint --version | grep -E '[.0-9]+' \ && vue --version | grep -E '[.0-9]+' \ && webpack --version | grep -E '[.0-9]+' \ \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index b2ec0a48..6708d889 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -45,7 +45,6 @@ gem_enabled: - mixlib_config - rb_inotify - mdl - - scss_lint # ------------------------------------------------------------------------------------------------- @@ -62,6 +61,7 @@ npm_enabled: - pm2 - mdlint - sass + - stylelint - vue_cli - vue_cli_service_global - webpack @@ -271,10 +271,6 @@ gem_available: version: 0.5.0 5.2: version: 0.5.0 - scss_lint: - name: scss_lint - all: - version: 0.57.1 # ------------------------------------------------------------------------------------------------- @@ -317,6 +313,9 @@ npm_available: sass: name: sass check: sass --version | grep -E '[.0-9]+' + stylelint: + name: stylelint + check: stylelint --version | grep -E '[.0-9]+' vue_cli: name: "@vue/cli" check: vue --version | grep -E '[.0-9]+'