Skip to content

Commit 0a5aadd

Browse files
cytopiacytopia
authored
Merge pull request #149 from devilbox/release-0.102
Release 0.102
2 parents 55a1333 + 64c41f7 commit 0a5aadd

13 files changed

Lines changed: 110 additions & 86 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Changelog
2+
3+
4+
## Unreleased
5+
6+
7+
## Release 0.102
8+
9+
#### Added
10+
- [#144](https://github.com/devilbox/docker-php-fpm/issues/144) Added CHANGELOG
11+
12+
#### Changed
13+
- [#123](https://github.com/devilbox/docker-php-fpm/issues/123) Added Dart Sass and removed Ruby Sass
14+
- Replace [scss-lint](https://github.com/sds/scss-lint) with [stylelint](https://github.com/stylelint/stylelint)

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@ RUN set -eux \
321321
# -------------------- mdlint --------------------
322322
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
323323
\
324+
# -------------------- sass --------------------
325+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
326+
\
327+
# -------------------- stylelint --------------------
328+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
329+
\
324330
# -------------------- vue_cli --------------------
325331
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
326332
\
@@ -360,12 +366,6 @@ RUN set -eux \
360366
# -------------------- mdl --------------------
361367
&& gem install mdl -v 0.5.0 \
362368
\
363-
# -------------------- scss_lint --------------------
364-
&& gem install scss_lint -v 0.57.1 \
365-
\
366-
# -------------------- sass --------------------
367-
&& gem install sass \
368-
\
369369
\
370370
&& rm -rf /root/.gem \
371371
&& rm -rf /tmp/* \
@@ -465,12 +465,13 @@ RUN set -eux \
465465
&& jsonlint --version | grep -E '[.0-9]+' \
466466
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
467467
&& mdlint --version | grep -E '[.0-9]+' \
468+
&& sass --version | grep -E '[.0-9]+' \
469+
&& stylelint --version | grep -E '[.0-9]+' \
468470
&& vue --version | grep -E '[.0-9]+' \
469471
&& webpack --version | grep -E '[.0-9]+' \
470472
\
471473
# -------------------- GEM --------------------
472474
&& mdl --version | grep -E '[.0-9]+' \
473-
&& sass --version | grep -E '[.0-9]+' \
474475
\
475476
# -------------------- Cleanup --------------------
476477
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,12 @@ RUN set -eux \
377377
# -------------------- mdlint --------------------
378378
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
379379
\
380+
# -------------------- sass --------------------
381+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
382+
\
383+
# -------------------- stylelint --------------------
384+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
385+
\
380386
# -------------------- vue_cli --------------------
381387
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
382388
\
@@ -416,12 +422,6 @@ RUN set -eux \
416422
# -------------------- mdl --------------------
417423
&& gem install mdl -v 0.5.0 \
418424
\
419-
# -------------------- scss_lint --------------------
420-
&& gem install scss_lint -v 0.57.1 \
421-
\
422-
# -------------------- sass --------------------
423-
&& gem install sass \
424-
\
425425
\
426426
&& rm -rf /root/.gem \
427427
&& rm -rf /tmp/* \
@@ -529,12 +529,13 @@ RUN set -eux \
529529
&& jsonlint --version | grep -E '[.0-9]+' \
530530
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
531531
&& mdlint --version | grep -E '[.0-9]+' \
532+
&& sass --version | grep -E '[.0-9]+' \
533+
&& stylelint --version | grep -E '[.0-9]+' \
532534
&& vue --version | grep -E '[.0-9]+' \
533535
&& webpack --version | grep -E '[.0-9]+' \
534536
\
535537
# -------------------- GEM --------------------
536538
&& mdl --version | grep -E '[.0-9]+' \
537-
&& sass --version | grep -E '[.0-9]+' \
538539
\
539540
# -------------------- Cleanup --------------------
540541
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-5.4‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,12 @@ RUN set -eux \
411411
# -------------------- mdlint --------------------
412412
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
413413
\
414+
# -------------------- sass --------------------
415+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
416+
\
417+
# -------------------- stylelint --------------------
418+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
419+
\
414420
# -------------------- vue_cli --------------------
415421
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
416422
\
@@ -450,12 +456,6 @@ RUN set -eux \
450456
# -------------------- mdl --------------------
451457
&& gem install mdl -v 0.5.0 \
452458
\
453-
# -------------------- scss_lint --------------------
454-
&& gem install scss_lint -v 0.57.1 \
455-
\
456-
# -------------------- sass --------------------
457-
&& gem install sass \
458-
\
459459
\
460460
&& rm -rf /root/.gem \
461461
&& rm -rf /tmp/* \
@@ -567,12 +567,13 @@ RUN set -eux \
567567
&& jsonlint --version | grep -E '[.0-9]+' \
568568
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
569569
&& mdlint --version | grep -E '[.0-9]+' \
570+
&& sass --version | grep -E '[.0-9]+' \
571+
&& stylelint --version | grep -E '[.0-9]+' \
570572
&& vue --version | grep -E '[.0-9]+' \
571573
&& webpack --version | grep -E '[.0-9]+' \
572574
\
573575
# -------------------- GEM --------------------
574576
&& mdl --version | grep -E '[.0-9]+' \
575-
&& sass --version | grep -E '[.0-9]+' \
576577
\
577578
# -------------------- Cleanup --------------------
578579
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-5.5‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,12 @@ RUN set -eux \
428428
# -------------------- mdlint --------------------
429429
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
430430
\
431+
# -------------------- sass --------------------
432+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
433+
\
434+
# -------------------- stylelint --------------------
435+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
436+
\
431437
# -------------------- vue_cli --------------------
432438
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
433439
\
@@ -467,12 +473,6 @@ RUN set -eux \
467473
# -------------------- mdl --------------------
468474
&& gem install mdl -v 0.5.0 \
469475
\
470-
# -------------------- scss_lint --------------------
471-
&& gem install scss_lint -v 0.57.1 \
472-
\
473-
# -------------------- sass --------------------
474-
&& gem install sass \
475-
\
476476
\
477477
&& rm -rf /root/.gem \
478478
&& rm -rf /tmp/* \
@@ -588,12 +588,13 @@ RUN set -eux \
588588
&& jsonlint --version | grep -E '[.0-9]+' \
589589
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
590590
&& mdlint --version | grep -E '[.0-9]+' \
591+
&& sass --version | grep -E '[.0-9]+' \
592+
&& stylelint --version | grep -E '[.0-9]+' \
591593
&& vue --version | grep -E '[.0-9]+' \
592594
&& webpack --version | grep -E '[.0-9]+' \
593595
\
594596
# -------------------- GEM --------------------
595597
&& mdl --version | grep -E '[.0-9]+' \
596-
&& sass --version | grep -E '[.0-9]+' \
597598
\
598599
# -------------------- Cleanup --------------------
599600
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-5.6‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,12 @@ RUN set -eux \
441441
# -------------------- mdlint --------------------
442442
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
443443
\
444+
# -------------------- sass --------------------
445+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
446+
\
447+
# -------------------- stylelint --------------------
448+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
449+
\
444450
# -------------------- vue_cli --------------------
445451
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
446452
\
@@ -480,12 +486,6 @@ RUN set -eux \
480486
# -------------------- mdl --------------------
481487
&& gem install mdl -v 0.5.0 \
482488
\
483-
# -------------------- scss_lint --------------------
484-
&& gem install scss_lint -v 0.57.1 \
485-
\
486-
# -------------------- sass --------------------
487-
&& gem install sass \
488-
\
489489
\
490490
&& rm -rf /root/.gem \
491491
&& rm -rf /tmp/* \
@@ -602,12 +602,13 @@ RUN set -eux \
602602
&& jsonlint --version | grep -E '[.0-9]+' \
603603
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
604604
&& mdlint --version | grep -E '[.0-9]+' \
605+
&& sass --version | grep -E '[.0-9]+' \
606+
&& stylelint --version | grep -E '[.0-9]+' \
605607
&& vue --version | grep -E '[.0-9]+' \
606608
&& webpack --version | grep -E '[.0-9]+' \
607609
\
608610
# -------------------- GEM --------------------
609611
&& mdl --version | grep -E '[.0-9]+' \
610-
&& sass --version | grep -E '[.0-9]+' \
611612
\
612613
# -------------------- Cleanup --------------------
613614
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-7.0‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,12 @@ RUN set -eux \
441441
# -------------------- mdlint --------------------
442442
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
443443
\
444+
# -------------------- sass --------------------
445+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
446+
\
447+
# -------------------- stylelint --------------------
448+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
449+
\
444450
# -------------------- vue_cli --------------------
445451
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
446452
\
@@ -480,12 +486,6 @@ RUN set -eux \
480486
# -------------------- mdl --------------------
481487
&& gem install mdl -v 0.5.0 \
482488
\
483-
# -------------------- scss_lint --------------------
484-
&& gem install scss_lint -v 0.57.1 \
485-
\
486-
# -------------------- sass --------------------
487-
&& gem install sass \
488-
\
489489
\
490490
&& rm -rf /root/.gem \
491491
&& rm -rf /tmp/* \
@@ -602,12 +602,13 @@ RUN set -eux \
602602
&& jsonlint --version | grep -E '[.0-9]+' \
603603
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
604604
&& mdlint --version | grep -E '[.0-9]+' \
605+
&& sass --version | grep -E '[.0-9]+' \
606+
&& stylelint --version | grep -E '[.0-9]+' \
605607
&& vue --version | grep -E '[.0-9]+' \
606608
&& webpack --version | grep -E '[.0-9]+' \
607609
\
608610
# -------------------- GEM --------------------
609611
&& mdl --version | grep -E '[.0-9]+' \
610-
&& sass --version | grep -E '[.0-9]+' \
611612
\
612613
# -------------------- Cleanup --------------------
613614
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-7.1‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,12 @@ RUN set -eux \
441441
# -------------------- mdlint --------------------
442442
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
443443
\
444+
# -------------------- sass --------------------
445+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
446+
\
447+
# -------------------- stylelint --------------------
448+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
449+
\
444450
# -------------------- vue_cli --------------------
445451
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
446452
\
@@ -480,12 +486,6 @@ RUN set -eux \
480486
# -------------------- mdl --------------------
481487
&& gem install mdl \
482488
\
483-
# -------------------- scss_lint --------------------
484-
&& gem install scss_lint -v 0.57.1 \
485-
\
486-
# -------------------- sass --------------------
487-
&& gem install sass \
488-
\
489489
\
490490
&& rm -rf /root/.gem \
491491
&& rm -rf /tmp/* \
@@ -602,12 +602,13 @@ RUN set -eux \
602602
&& jsonlint --version | grep -E '[.0-9]+' \
603603
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
604604
&& mdlint --version | grep -E '[.0-9]+' \
605+
&& sass --version | grep -E '[.0-9]+' \
606+
&& stylelint --version | grep -E '[.0-9]+' \
605607
&& vue --version | grep -E '[.0-9]+' \
606608
&& webpack --version | grep -E '[.0-9]+' \
607609
\
608610
# -------------------- GEM --------------------
609611
&& mdl --version | grep -E '[.0-9]+' \
610-
&& sass --version | grep -E '[.0-9]+' \
611612
\
612613
# -------------------- Cleanup --------------------
613614
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-7.2‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,12 @@ RUN set -eux \
442442
# -------------------- mdlint --------------------
443443
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
444444
\
445+
# -------------------- sass --------------------
446+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
447+
\
448+
# -------------------- stylelint --------------------
449+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
450+
\
445451
# -------------------- vue_cli --------------------
446452
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
447453
\
@@ -481,12 +487,6 @@ RUN set -eux \
481487
# -------------------- mdl --------------------
482488
&& gem install mdl \
483489
\
484-
# -------------------- scss_lint --------------------
485-
&& gem install scss_lint -v 0.57.1 \
486-
\
487-
# -------------------- sass --------------------
488-
&& gem install sass \
489-
\
490490
\
491491
&& rm -rf /root/.gem \
492492
&& rm -rf /tmp/* \
@@ -603,12 +603,13 @@ RUN set -eux \
603603
&& jsonlint --version | grep -E '[.0-9]+' \
604604
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
605605
&& mdlint --version | grep -E '[.0-9]+' \
606+
&& sass --version | grep -E '[.0-9]+' \
607+
&& stylelint --version | grep -E '[.0-9]+' \
606608
&& vue --version | grep -E '[.0-9]+' \
607609
&& webpack --version | grep -E '[.0-9]+' \
608610
\
609611
# -------------------- GEM --------------------
610612
&& mdl --version | grep -E '[.0-9]+' \
611-
&& sass --version | grep -E '[.0-9]+' \
612613
\
613614
# -------------------- Cleanup --------------------
614615
&& rm -rf /home/devilbox/.cache/ \

‎Dockerfiles/work/Dockerfile-7.3‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,12 @@ RUN set -eux \
428428
# -------------------- mdlint --------------------
429429
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
430430
\
431+
# -------------------- sass --------------------
432+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
433+
\
434+
# -------------------- stylelint --------------------
435+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
436+
\
431437
# -------------------- vue_cli --------------------
432438
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
433439
\
@@ -467,12 +473,6 @@ RUN set -eux \
467473
# -------------------- mdl --------------------
468474
&& gem install mdl \
469475
\
470-
# -------------------- scss_lint --------------------
471-
&& gem install scss_lint -v 0.57.1 \
472-
\
473-
# -------------------- sass --------------------
474-
&& gem install sass \
475-
\
476476
\
477477
&& rm -rf /root/.gem \
478478
&& rm -rf /tmp/* \
@@ -588,12 +588,13 @@ RUN set -eux \
588588
&& jsonlint --version | grep -E '[.0-9]+' \
589589
&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
590590
&& mdlint --version | grep -E '[.0-9]+' \
591+
&& sass --version | grep -E '[.0-9]+' \
592+
&& stylelint --version | grep -E '[.0-9]+' \
591593
&& vue --version | grep -E '[.0-9]+' \
592594
&& webpack --version | grep -E '[.0-9]+' \
593595
\
594596
# -------------------- GEM --------------------
595597
&& mdl --version | grep -E '[.0-9]+' \
596-
&& sass --version | grep -E '[.0-9]+' \
597598
\
598599
# -------------------- Cleanup --------------------
599600
&& rm -rf /home/devilbox/.cache/ \

0 commit comments

Comments
 (0)