Skip to content

Commit 308f435

Browse files
cytopiacytopia
committed
Backport tools
1 parent 5b41a9b commit 308f435

31 files changed

Lines changed: 1152 additions & 29 deletions

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

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44

55
# The following specifies the order in which tools are being installed.
66
tools_enabled:
7-
- angular_cli
7+
- angular-cli
88
- asgardcms
99
- codeception
10+
- deployer
1011
- eslint
12+
- grunt-cli
13+
- gulp
1114
- jq
15+
- jsonlint
1216
- lumen
1317
- mdl
1418
- phpunit
@@ -20,7 +24,7 @@ tools_enabled:
2024

2125
# The following specifies how tools are being installed.
2226
tools_available:
23-
angular_cli:
27+
angular-cli:
2428
disabled: []
2529
check: ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false)
2630
all:
@@ -61,6 +65,28 @@ tools_available:
6165
run_dep: []
6266
# pre:
6367
# post:
68+
deployer:
69+
disabled: [5.2, 5.3]
70+
check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' || (dep --version; false)
71+
all:
72+
type: custom
73+
command: curl -sS -k -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
74+
post: chmod +x /usr/local/bin/dep
75+
7.1:
76+
type: custom
77+
command: curl -sS -k -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep
78+
7.0:
79+
type: custom
80+
command: curl -sS -k -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep
81+
5.6:
82+
type: custom
83+
command: curl -sS -k -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
84+
5.5:
85+
type: custom
86+
command: curl -sS -k -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
87+
5.4:
88+
type: custom
89+
command: curl -sS -k -L --fail https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep
6490
eslint:
6591
disabled: []
6692
check: eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false)
@@ -73,12 +99,48 @@ tools_available:
7399
run_dep: []
74100
pre:
75101
post:
102+
grunt-cli:
103+
disabled: []
104+
check: grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false)
105+
all:
106+
type: npm
107+
package: "grunt-cli"
108+
binary: grunt
109+
version:
110+
build_dep: []
111+
run_dep: []
112+
pre:
113+
post:
114+
gulp:
115+
disabled: []
116+
check: gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false)
117+
all:
118+
type: npm
119+
package: gulp
120+
binary: gulp
121+
version:
122+
build_dep: []
123+
run_dep: []
124+
pre:
125+
post:
76126
jq:
77127
disabled: []
78128
check: jq --version 2>&1 | grep -E '[0-9][.0-9]+' || (jq --version; false)
79129
all:
80130
type: apt
81131
package: jq
132+
jsonlint:
133+
disabled: []
134+
check: jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false)
135+
all:
136+
type: npm
137+
package: jsonlint
138+
binary: jsonlint
139+
version:
140+
build_dep: []
141+
run_dep: []
142+
pre:
143+
post:
82144
lumen:
83145
disabled: [5.2, 5.3, 5.4]
84146
check: lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' || (lumen --version; false)

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ RUN set -eux \
239239
### Install defined php_tools
240240
###
241241
242-
# -------------------- (npm) angular_cli --------------------
242+
# -------------------- (npm) angular-cli --------------------
243243
RUN set -eux \
244244
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \
245245
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \
@@ -253,11 +253,32 @@ RUN set -eux \
253253
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
254254
&& true
255255
256+
# -------------------- (npm) grunt-cli --------------------
257+
RUN set -eux \
258+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \
259+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \
260+
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
261+
&& true
262+
263+
# -------------------- (npm) gulp --------------------
264+
RUN set -eux \
265+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \
266+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \
267+
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
268+
&& true
269+
256270
# -------------------- (apt) jq --------------------
257271
RUN set -eux \
258272
&& jq --version 2>&1 | grep -E '[0-9][.0-9]+' || (jq --version; false) \
259273
&& true
260274
275+
# -------------------- (npm) jsonlint --------------------
276+
RUN set -eux \
277+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \
278+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \
279+
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
280+
&& true
281+
261282
# -------------------- (rubygem) mdl --------------------
262283
RUN set -eux \
263284
&& gem install mixlib-config -v 2.2.4 \
@@ -366,7 +387,7 @@ COPY --from=devilbox-work-tools-builder /var/lib/gems /var/lib/gems
366387
FROM devilbox-work-tools as devilbox-work-tools-test
367388
368389
369-
# -------------------- (npm) angular_cli --------------------
390+
# -------------------- (npm) angular-cli --------------------
370391
RUN set -eux \
371392
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \
372393
&& true
@@ -376,11 +397,26 @@ RUN set -eux \
376397
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
377398
&& true
378399
400+
# -------------------- (npm) grunt-cli --------------------
401+
RUN set -eux \
402+
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
403+
&& true
404+
405+
# -------------------- (npm) gulp --------------------
406+
RUN set -eux \
407+
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
408+
&& true
409+
379410
# -------------------- (apt) jq --------------------
380411
RUN set -eux \
381412
&& jq --version 2>&1 | grep -E '[0-9][.0-9]+' || (jq --version; false) \
382413
&& true
383414
415+
# -------------------- (npm) jsonlint --------------------
416+
RUN set -eux \
417+
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
418+
&& true
419+
384420
# -------------------- (rubygem) mdl --------------------
385421
RUN set -eux \
386422
&& mdl --version | grep -E '[.0-9]+' || (mdl --version; false) \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ RUN set -eux \
258258
### Install defined php_tools
259259
###
260260
261-
# -------------------- (npm) angular_cli --------------------
261+
# -------------------- (npm) angular-cli --------------------
262262
RUN set -eux \
263263
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \
264264
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \
@@ -272,11 +272,32 @@ RUN set -eux \
272272
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
273273
&& true
274274
275+
# -------------------- (npm) grunt-cli --------------------
276+
RUN set -eux \
277+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \
278+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \
279+
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
280+
&& true
281+
282+
# -------------------- (npm) gulp --------------------
283+
RUN set -eux \
284+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \
285+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \
286+
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
287+
&& true
288+
275289
# -------------------- (apt) jq --------------------
276290
RUN set -eux \
277291
&& jq --version 2>&1 | grep -E '[0-9][.0-9]+' || (jq --version; false) \
278292
&& true
279293
294+
# -------------------- (npm) jsonlint --------------------
295+
RUN set -eux \
296+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \
297+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \
298+
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
299+
&& true
300+
280301
# -------------------- (rubygem) mdl --------------------
281302
RUN set -eux \
282303
&& gem install mixlib-config -v 2.2.4 \
@@ -407,7 +428,7 @@ COPY --from=devilbox-work-tools-builder /var/lib/gems /var/lib/gems
407428
FROM devilbox-work-tools as devilbox-work-tools-test
408429
409430
410-
# -------------------- (npm) angular_cli --------------------
431+
# -------------------- (npm) angular-cli --------------------
411432
RUN set -eux \
412433
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \
413434
&& true
@@ -417,11 +438,26 @@ RUN set -eux \
417438
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
418439
&& true
419440
441+
# -------------------- (npm) grunt-cli --------------------
442+
RUN set -eux \
443+
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
444+
&& true
445+
446+
# -------------------- (npm) gulp --------------------
447+
RUN set -eux \
448+
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
449+
&& true
450+
420451
# -------------------- (apt) jq --------------------
421452
RUN set -eux \
422453
&& jq --version 2>&1 | grep -E '[0-9][.0-9]+' || (jq --version; false) \
423454
&& true
424455
456+
# -------------------- (npm) jsonlint --------------------
457+
RUN set -eux \
458+
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
459+
&& true
460+
425461
# -------------------- (rubygem) mdl --------------------
426462
RUN set -eux \
427463
&& mdl --version | grep -E '[.0-9]+' || (mdl --version; false) \

‎Dockerfiles/work/Dockerfile-5.4‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ RUN set -eux \
258258
### Install defined php_tools
259259
###
260260
261-
# -------------------- (npm) angular_cli --------------------
261+
# -------------------- (npm) angular-cli --------------------
262262
RUN set -eux \
263263
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force @angular/cli' devilbox \
264264
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/ng /usr/local/bin/ \
@@ -273,18 +273,46 @@ RUN set -eux \
273273
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' || (codecept --version; false) \
274274
&& true
275275
276+
# -------------------- (custom) deployer --------------------
277+
RUN set -eux \
278+
&& curl -sS -k -L --fail https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep \
279+
&& chmod +x /usr/local/bin/dep \
280+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' || (dep --version; false) \
281+
&& true
282+
276283
# -------------------- (npm) eslint --------------------
277284
RUN set -eux \
278285
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force eslint' devilbox \
279286
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/eslint /usr/local/bin/ \
280287
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
281288
&& true
282289
290+
# -------------------- (npm) grunt-cli --------------------
291+
RUN set -eux \
292+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force grunt-cli' devilbox \
293+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/grunt /usr/local/bin/ \
294+
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
295+
&& true
296+
297+
# -------------------- (npm) gulp --------------------
298+
RUN set -eux \
299+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force gulp' devilbox \
300+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/gulp /usr/local/bin/ \
301+
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
302+
&& true
303+
283304
# -------------------- (apt) jq --------------------
284305
RUN set -eux \
285306
&& jq --version 2>&1 | grep -E '[0-9][.0-9]+' || (jq --version; false) \
286307
&& true
287308
309+
# -------------------- (npm) jsonlint --------------------
310+
RUN set -eux \
311+
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force jsonlint' devilbox \
312+
&& ln -s /opt/nvm/versions/node/$(su -c '. /opt/nvm/nvm.sh; node --version' devilbox)/bin/jsonlint /usr/local/bin/ \
313+
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
314+
&& true
315+
288316
# -------------------- (rubygem) mdl --------------------
289317
RUN set -eux \
290318
&& gem install mixlib-config -v 2.2.4 \
@@ -415,7 +443,7 @@ COPY --from=devilbox-work-tools-builder /var/lib/gems /var/lib/gems
415443
FROM devilbox-work-tools as devilbox-work-tools-test
416444
417445
418-
# -------------------- (npm) angular_cli --------------------
446+
# -------------------- (npm) angular-cli --------------------
419447
RUN set -eux \
420448
&& ng version 2>&1 | grep -iE 'Angular CLI:\s*[0-9][.0-9]+' || (ng version; false) \
421449
&& true
@@ -425,16 +453,36 @@ RUN set -eux \
425453
&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[0-9][.0-9]+$' || (codecept --version; false) \
426454
&& true
427455
456+
# -------------------- (custom) deployer --------------------
457+
RUN set -eux \
458+
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' || (dep --version; false) \
459+
&& true
460+
428461
# -------------------- (npm) eslint --------------------
429462
RUN set -eux \
430463
&& eslint -v | grep -E '[0-9][.0-9]+' || (eslint -v; false) \
431464
&& true
432465
466+
# -------------------- (npm) grunt-cli --------------------
467+
RUN set -eux \
468+
&& grunt --version | grep -E '[0-9][.0-9]+' || (grunt --version; false) \
469+
&& true
470+
471+
# -------------------- (npm) gulp --------------------
472+
RUN set -eux \
473+
&& gulp --version | grep -E '[0-9][.0-9]+' || (gulp --version; false) \
474+
&& true
475+
433476
# -------------------- (apt) jq --------------------
434477
RUN set -eux \
435478
&& jq --version 2>&1 | grep -E '[0-9][.0-9]+' || (jq --version; false) \
436479
&& true
437480
481+
# -------------------- (npm) jsonlint --------------------
482+
RUN set -eux \
483+
&& jsonlint --version | grep -E '[0-9][.0-9]+' || (jsonlint --version; false) \
484+
&& true
485+
438486
# -------------------- (rubygem) mdl --------------------
439487
RUN set -eux \
440488
&& mdl --version | grep -E '[.0-9]+' || (mdl --version; false) \

0 commit comments

Comments
 (0)