Skip to content

Commit 30c3118

Browse files
cytopiacytopia
committed
Backport more tools
1 parent c362817 commit 30c3118

21 files changed

Lines changed: 386 additions & 196 deletions

‎.ansible/DOCKERFILES/Dockerfile-work.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ RUN set -eux \
313313
{%- set npm_package = fn.tool_npm_get_package(php_version, tool, tools_available) -%}
314314
{%- set npm_version = fn.tool_npm_get_version(php_version, tool, tools_available) -%}
315315
{%- set npm_binary = fn.tool_npm_get_binary(php_version, tool, tools_available) -%}
316-
{{ "\n\t" }}&& su -c '. {{ nvm_home }}/nvm.sh; npm install -g --force {{ npm_package }}{{ npm_version }}' devilbox \
316+
{{ "\n\t" }}&& su -c '. {{ nvm_home }}/nvm.sh; npm install --location=global {{ npm_package }}{{ npm_version }}' devilbox \
317317
{%- if npm_binary | length -%}
318318
{{ "\n\t" }}&& ln -s {{ nvm_home }}/versions/node/$(su -c '. {{ nvm_home }}/nvm.sh; node --version' devilbox)/bin/{{ npm_binary }} /usr/local/bin/ \
319319
{%- endif -%}

‎.ansible/group_vars/all/work.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ tools_enabled:
3838
- svn
3939
- symfony-cli
4040
- tig
41+
- vim
4142
- vue-cli
4243
- webpack-cli
4344
- wp-cli
@@ -249,7 +250,7 @@ tools_available:
249250
package: jq
250251
laravel-installer:
251252
disabled: [5.2, 5.3]
252-
check: laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false)
253+
check: laravel --version | grep ^Laravel | grep -E '[0-9]\.[0-9]+' || (laravel --version; false)
253254
all:
254255
type: composer
255256
composer: 2
@@ -322,7 +323,7 @@ tools_available:
322323
check: |
323324
echo test > test.txt \
324325
&& mutool create -o test.pdf test.txt \
325-
&& file test.pdf | gre 'PDF document' \
326+
&& file test.pdf | grep 'PDF document' \
326327
&& rm test.txt \
327328
&& rm test.pdf \
328329
all:
@@ -570,6 +571,12 @@ tools_available:
570571
all:
571572
type: apt
572573
package: tig
574+
vim:
575+
disabled: []
576+
check: vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false)
577+
all:
578+
type: apt
579+
package: vim
573580
vue-cli:
574581
disabled: []
575582
check: vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false)

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ RUN set -eux \
243243
shellcheck \
244244
subversion \
245245
tig \
246+
vim \
246247
zsh \
247248
&& rm -rf /var/lib/apt/lists/*
248249
@@ -252,14 +253,14 @@ RUN set -eux \
252253
253254
# -------------------- (npm) angular-cli --------------------
254255
RUN set -eux \
255-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \
256+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \
256257
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \
257258
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \
258259
&& true
259260
260261
# -------------------- (npm) eslint --------------------
261262
RUN set -eux \
262-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \
263+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \
263264
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \
264265
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
265266
&& true
@@ -271,7 +272,7 @@ RUN set -eux \
271272
272273
# -------------------- (npm) jsonlint --------------------
273274
RUN set -eux \
274-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \
275+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \
275276
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \
276277
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
277278
&& true
@@ -309,14 +310,14 @@ RUN set -eux \
309310
310311
# -------------------- (npm) grunt-cli --------------------
311312
RUN set -eux \
312-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \
313+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \
313314
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \
314315
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
315316
&& true
316317
317318
# -------------------- (npm) gulp --------------------
318319
RUN set -eux \
319-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \
320+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \
320321
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \
321322
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
322323
&& true
@@ -335,7 +336,7 @@ RUN set -eux \
335336
336337
# -------------------- (npm) mdlint --------------------
337338
RUN set -eux \
338-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
339+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \
339340
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \
340341
&& mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \
341342
&& true
@@ -344,7 +345,7 @@ RUN set -eux \
344345
RUN set -eux \
345346
&& echo test > test.txt \
346347
&& mutool create -o test.pdf test.txt \
347-
&& file test.pdf | gre 'PDF document' \
348+
&& file test.pdf | grep 'PDF document' \
348349
&& rm test.txt \
349350
&& rm test.pdf \
350351
\
@@ -368,7 +369,7 @@ RUN set -eux \
368369
369370
# -------------------- (npm) pm2 --------------------
370371
RUN set -eux \
371-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \
372+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \
372373
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \
373374
&& pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \
374375
&& true
@@ -393,7 +394,7 @@ RUN set -eux \
393394
394395
# -------------------- (npm) sass --------------------
395396
RUN set -eux \
396-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
397+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \
397398
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \
398399
&& sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \
399400
&& true
@@ -405,7 +406,7 @@ RUN set -eux \
405406
406407
# -------------------- (npm) stylelint --------------------
407408
RUN set -eux \
408-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
409+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \
409410
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \
410411
&& stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \
411412
&& true
@@ -426,16 +427,21 @@ RUN set -eux \
426427
&& tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \
427428
&& true
428429
430+
# -------------------- (apt) vim --------------------
431+
RUN set -eux \
432+
&& vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \
433+
&& true
434+
429435
# -------------------- (npm) vue-cli --------------------
430436
RUN set -eux \
431-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
437+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \
432438
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \
433439
&& vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \
434440
&& true
435441
436442
# -------------------- (npm) webpack-cli --------------------
437443
RUN set -eux \
438-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
444+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \
439445
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \
440446
&& webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \
441447
&& true
@@ -500,6 +506,7 @@ RUN set -eux \
500506
shellcheck \
501507
subversion \
502508
tig \
509+
vim \
503510
zsh \
504511
&& rm -rf /var/lib/apt/lists/*
505512
@@ -611,7 +618,7 @@ RUN set -eux \
611618
RUN set -eux \
612619
&& echo test > test.txt \
613620
&& mutool create -o test.pdf test.txt \
614-
&& file test.pdf | gre 'PDF document' \
621+
&& file test.pdf | grep 'PDF document' \
615622
&& rm test.txt \
616623
&& rm test.pdf \
617624
\
@@ -677,6 +684,11 @@ RUN set -eux \
677684
&& tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \
678685
&& true
679686
687+
# -------------------- (apt) vim --------------------
688+
RUN set -eux \
689+
&& vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \
690+
&& true
691+
680692
# -------------------- (npm) vue-cli --------------------
681693
RUN set -eux \
682694
&& vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ RUN set -eux \
277277
shellcheck \
278278
subversion \
279279
tig \
280+
vim \
280281
zsh \
281282
&& rm -rf /var/lib/apt/lists/*
282283
@@ -286,14 +287,14 @@ RUN set -eux \
286287
287288
# -------------------- (npm) angular-cli --------------------
288289
RUN set -eux \
289-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \
290+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global @angular/cli' devilbox \
290291
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \
291292
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \
292293
&& true
293294
294295
# -------------------- (npm) eslint --------------------
295296
RUN set -eux \
296-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \
297+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global eslint' devilbox \
297298
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \
298299
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
299300
&& true
@@ -305,7 +306,7 @@ RUN set -eux \
305306
306307
# -------------------- (npm) jsonlint --------------------
307308
RUN set -eux \
308-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \
309+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global jsonlint' devilbox \
309310
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \
310311
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
311312
&& true
@@ -343,14 +344,14 @@ RUN set -eux \
343344
344345
# -------------------- (npm) grunt-cli --------------------
345346
RUN set -eux \
346-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \
347+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global grunt-cli' devilbox \
347348
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \
348349
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
349350
&& true
350351
351352
# -------------------- (npm) gulp --------------------
352353
RUN set -eux \
353-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \
354+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global gulp' devilbox \
354355
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \
355356
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
356357
&& true
@@ -369,7 +370,7 @@ RUN set -eux \
369370
370371
# -------------------- (npm) mdlint --------------------
371372
RUN set -eux \
372-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force mdlint' devilbox \
373+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global mdlint' devilbox \
373374
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/mdlint /usr/local/bin/ \
374375
&& mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false) \
375376
&& true
@@ -378,7 +379,7 @@ RUN set -eux \
378379
RUN set -eux \
379380
&& echo test > test.txt \
380381
&& mutool create -o test.pdf test.txt \
381-
&& file test.pdf | gre 'PDF document' \
382+
&& file test.pdf | grep 'PDF document' \
382383
&& rm test.txt \
383384
&& rm test.pdf \
384385
\
@@ -431,7 +432,7 @@ RUN set -eux \
431432
432433
# -------------------- (npm) pm2 --------------------
433434
RUN set -eux \
434-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force pm2' devilbox \
435+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global pm2' devilbox \
435436
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/pm2 /usr/local/bin/ \
436437
&& pm2 --no-daemon --version | tail -1 | grep -E '[0-9][.0-9]+' || (pm2 --no-daemon --version; false) \
437438
&& true
@@ -456,7 +457,7 @@ RUN set -eux \
456457
457458
# -------------------- (npm) sass --------------------
458459
RUN set -eux \
459-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force sass' devilbox \
460+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global sass' devilbox \
460461
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/sass /usr/local/bin/ \
461462
&& sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false) \
462463
&& true
@@ -468,7 +469,7 @@ RUN set -eux \
468469
469470
# -------------------- (npm) stylelint --------------------
470471
RUN set -eux \
471-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force stylelint' devilbox \
472+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global stylelint' devilbox \
472473
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/stylelint /usr/local/bin/ \
473474
&& stylelint --version | grep -E '[0-9][.0-9]+' || (stylelint --version; false) \
474475
&& true
@@ -489,16 +490,21 @@ RUN set -eux \
489490
&& tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \
490491
&& true
491492
493+
# -------------------- (apt) vim --------------------
494+
RUN set -eux \
495+
&& vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \
496+
&& true
497+
492498
# -------------------- (npm) vue-cli --------------------
493499
RUN set -eux \
494-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @vue/cli' devilbox \
500+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global @vue/cli' devilbox \
495501
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/vue /usr/local/bin/ \
496502
&& vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \
497503
&& true
498504
499505
# -------------------- (npm) webpack-cli --------------------
500506
RUN set -eux \
501-
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
507+
&& su -c '. /opt/nvm/nvm.sh; npm install --location=global webpack-cli' devilbox \
502508
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/webpack-cli /usr/local/bin/ \
503509
&& webpack-cli --version | grep -E '[0-9][.0-9]+' || (webpack-cli --version; false) \
504510
&& true
@@ -571,6 +577,7 @@ RUN set -eux \
571577
shellcheck \
572578
subversion \
573579
tig \
580+
vim \
574581
zsh \
575582
&& rm -rf /var/lib/apt/lists/*
576583
@@ -682,7 +689,7 @@ RUN set -eux \
682689
RUN set -eux \
683690
&& echo test > test.txt \
684691
&& mutool create -o test.pdf test.txt \
685-
&& file test.pdf | gre 'PDF document' \
692+
&& file test.pdf | grep 'PDF document' \
686693
&& rm test.txt \
687694
&& rm test.pdf \
688695
\
@@ -763,6 +770,11 @@ RUN set -eux \
763770
&& tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false) \
764771
&& true
765772
773+
# -------------------- (apt) vim --------------------
774+
RUN set -eux \
775+
&& vim --version | grep ^VIM | grep -E '[0-9]\.[0-9]+' || (vim --version; false) \
776+
&& true
777+
766778
# -------------------- (npm) vue-cli --------------------
767779
RUN set -eux \
768780
&& vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false) \

0 commit comments

Comments
 (0)