Skip to content

Commit 36bc9dc

Browse files
committed
Backport more toole
1 parent 820159d commit 36bc9dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2501
-352
lines changed

.ansible/group_vars/all/slim.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ base_software_enabled:
7777
- dig # required by Devilbox Intranet
7878
- netcat # required by Devilbox Intranet
7979
- ping # required by Devilbox Intranet
80+
- sudo # required by /etc/sudoers.d/devilbox config file
8081
- blackfire
8182
- mhsendmail
8283
- mongo_client
@@ -283,6 +284,15 @@ base_software_available:
283284
type: apt
284285
package: iputils-ping
285286

287+
###
288+
### sudo
289+
###
290+
sudo:
291+
check: sudo --version | grep -E 'version [0-9]+\.[0-9]+'
292+
all:
293+
type: apt
294+
package: sudo
295+
286296
###
287297
### Blackfire
288298
###

.ansible/group_vars/all/work.yml

Lines changed: 115 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,32 @@ tools_enabled:
1818
- gulp
1919
- jq
2020
- laravel-installer
21+
- laravel-lumen
2122
- linkcheck
22-
- lumen
2323
- mdlint
24+
- mupdf-tools
25+
- phalcon-devtools
2426
- php-cs-fixer
2527
- phpcbf
2628
- phpcs
2729
- phpmd
2830
- phpunit
2931
- pm2
3032
- pwncat
33+
- ssh
34+
- rsync
3135
- sass
3236
- shellcheck
3337
- stylelint
38+
- svn
3439
- symfony-cli
40+
- tig
3541
- vue-cli
3642
- webpack-cli
3743
- wp-cli
3844
- yamllint
3945
- yq
46+
- zsh
4047

4148

4249
# The following specifies how tools are being installed.
@@ -242,7 +249,7 @@ tools_available:
242249
package: jq
243250
laravel-installer:
244251
disabled: [5.2, 5.3]
245-
check: laravel --version | grep -E '^Laravel Installer\s[0-9][.0-9]+$' || (laravel --version; false)
252+
check: laravel --version | grep version | grep -E '[0-9]\.[0-9]+' || (laravel --version; false)
246253
all:
247254
type: composer
248255
composer: 2
@@ -275,18 +282,9 @@ tools_available:
275282
type: composer
276283
binary: laravel
277284
version: 1.3.7
278-
linkcheck:
279-
disabled: []
280-
check: linkcheck --version | grep -E 'v[0-9][.0-9]+' || (linkcheck --version; false)
281-
all:
282-
type: custom
283-
command: curl -sS -L --fail -o /usr/local/bin/linkcheck https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck
284-
post: chmod +x /usr/local/bin/linkcheck
285-
build_dep: []
286-
run_dep: []
287-
lumen:
285+
laravel-lumen:
288286
disabled: [5.2, 5.3, 5.4]
289-
check: lumen --version 2>/dev/null | grep -E '^Lumen Installer\s[0-9][.0-9]+$' || (lumen --version; false)
287+
check: lumen --version 2>/dev/null | grep ^Lumen | grep -E '[0-9]\.[0-9]+' || (lumen --version; false)
290288
all:
291289
type: composer
292290
composer: 2
@@ -298,6 +296,15 @@ tools_available:
298296
run_dep: []
299297
# pre:
300298
# post:
299+
linkcheck:
300+
disabled: []
301+
check: linkcheck --version | grep -E 'v[0-9][.0-9]+' || (linkcheck --version; false)
302+
all:
303+
type: custom
304+
command: curl -sS -L --fail -o /usr/local/bin/linkcheck https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck
305+
post: chmod +x /usr/local/bin/linkcheck
306+
build_dep: []
307+
run_dep: []
301308
mdlint:
302309
disabled: []
303310
check: mdlint --version | grep -E '[0-9][.0-9]+' || (mdlint --version; false)
@@ -310,8 +317,72 @@ tools_available:
310317
run_dep: []
311318
pre:
312319
post:
320+
mupdf-tools:
321+
disabled: []
322+
check: |
323+
echo test > test.txt \
324+
&& mutool create -o test.pdf test.txt \
325+
&& file test.pdf | gre 'PDF document' \
326+
&& rm test.txt \
327+
&& rm test.pdf \
328+
all:
329+
type: apt
330+
package: mupdf-tools
331+
phalcon-devtools:
332+
disabled: [5.2, 5.3, 5.4, 8.2]
333+
check: |
334+
if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
335+
echo "extension=phalcon.so" > /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini; \
336+
fi \
337+
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
338+
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
339+
fi \
340+
\
341+
\
342+
&& phalcon commands | grep -E '[0-9][.0-9]+' || (phalcon commands; false) \
343+
\
344+
\
345+
&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini ]; then \
346+
rm /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini; \
347+
fi \
348+
&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini ]; then \
349+
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
350+
fi \
351+
all:
352+
type: composer
353+
composer: 2
354+
package: phalcon/devtools
355+
binary: phalcon
356+
# Enable phalcon.so (and its requirement psr prior installing)
357+
pre: |
358+
if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
359+
echo "extension=phalcon.so" > /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini; \
360+
fi \
361+
&& if find /usr/local/lib/php/extensions/ -name psr.so | grep psr; then \
362+
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
363+
fi \
364+
# Disable phalcon.so (and its requirement psr after installing)
365+
post: |
366+
if [ -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini ]; then \
367+
rm /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini; \
368+
fi \
369+
&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini ]; then \
370+
echo "extension=psr.so" > /usr/local/etc/php/conf.d/docker-php-ext-psr.ini; \
371+
fi \
372+
7.1:
373+
type: composer
374+
version: 3.4.11
375+
7.0:
376+
type: composer
377+
version: 3.4.11
378+
5.6:
379+
type: composer
380+
version: 3.4.11
381+
5.5:
382+
type: composer
383+
version: 3.4.11
313384
php-cs-fixer:
314-
disabled: [5.2]
385+
disabled: [5.2, 8.2]
315386
check: php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' || (php-cs-fixer --version; false)
316387
all:
317388
type: custom
@@ -437,6 +508,18 @@ tools_available:
437508
pre:
438509
post: |
439510
ln -s pwncat /usr/local/bin/netcat \
511+
ssh:
512+
disabled: []
513+
check: ssh -V 2>&1 | grep ^OpenSSH || (ssh -V; false)
514+
all:
515+
type: apt
516+
package: openssh-client
517+
rsync:
518+
disabled: []
519+
check: rsync --version | grep version | grep -E '[0-9]\.[0-9]+' || (rsync --version; false)
520+
all:
521+
type: apt
522+
package: rsync
440523
sass:
441524
disabled: []
442525
check: sass --version | grep -E '[0-9][.0-9]+' || (sass --version; false)
@@ -467,6 +550,12 @@ tools_available:
467550
run_dep: []
468551
pre:
469552
post:
553+
svn:
554+
disabled: []
555+
check: svn --version | grep version | grep -E '[0-9]+\.[0-9]+' || (svn --version; false)
556+
all:
557+
type: apt
558+
package: subversion
470559
symfony-cli:
471560
disabled: []
472561
check: symfony --no-ansi -V | grep -E 'version [0-9][.0-9]+' || (symfony --no-ansi -V; false)
@@ -475,6 +564,12 @@ tools_available:
475564
command: curl -sS https://get.symfony.com/cli/installer | bash -s -- --install-dir /usr/local/bin
476565
build_dep: []
477566
run_dep: []
567+
tig:
568+
disabled: []
569+
check: tig --version 2>&1 | grep -E '[0-9][.0-9]+' || (tig --version; false)
570+
all:
571+
type: apt
572+
package: tig
478573
vue-cli:
479574
disabled: []
480575
check: vue --version | grep -E '[0-9][.0-9]+' || (vue --version; false)
@@ -538,3 +633,9 @@ tools_available:
538633
run_dep: []
539634
pre:
540635
post:
636+
zsh:
637+
disabled: []
638+
check: zsh --version 2>&1 | grep -E '[0-9][.0-9]+' || (zsh --version; false)
639+
all:
640+
type: apt
641+
package: zsh

Dockerfiles/slim/Dockerfile-5.2

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN set -eux \
6666
dnsutils \
6767
iputils-ping \
6868
netcat-openbsd \
69+
sudo \
6970
&& rm -rf /var/lib/apt/lists/*
7071

7172
###
@@ -87,6 +88,11 @@ RUN set -eux \
8788
&& ping -V | grep ^ping \
8889
&& true
8990

91+
# -------------------- sudo --------------------
92+
RUN set -eux \
93+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
94+
&& true
95+
9096
# -------------------- blackfire --------------------
9197
RUN set -eux \
9298
&& apt-get update \
@@ -304,6 +310,7 @@ RUN set -eux \
304310
dnsutils \
305311
iputils-ping \
306312
netcat-openbsd \
313+
sudo \
307314
&& rm -rf /var/lib/apt/lists/*
308315

309316
###
@@ -467,6 +474,11 @@ RUN set -eux \
467474
&& ping -V | grep ^ping \
468475
&& true
469476

477+
# -------------------- sudo --------------------
478+
RUN set -eux \
479+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
480+
&& true
481+
470482
# -------------------- blackfire --------------------
471483
RUN set -eux \
472484
&& blackfire version \

Dockerfiles/slim/Dockerfile-5.3

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN set -eux \
6666
dnsutils \
6767
iputils-ping \
6868
netcat-openbsd \
69+
sudo \
6970
&& rm -rf /var/lib/apt/lists/*
7071

7172
###
@@ -87,6 +88,11 @@ RUN set -eux \
8788
&& ping -V | grep ^ping \
8889
&& true
8990

91+
# -------------------- sudo --------------------
92+
RUN set -eux \
93+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
94+
&& true
95+
9096
# -------------------- blackfire --------------------
9197
RUN set -eux \
9298
&& apt-get update \
@@ -304,6 +310,7 @@ RUN set -eux \
304310
dnsutils \
305311
iputils-ping \
306312
netcat-openbsd \
313+
sudo \
307314
&& rm -rf /var/lib/apt/lists/*
308315

309316
###
@@ -467,6 +474,11 @@ RUN set -eux \
467474
&& ping -V | grep ^ping \
468475
&& true
469476

477+
# -------------------- sudo --------------------
478+
RUN set -eux \
479+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
480+
&& true
481+
470482
# -------------------- blackfire --------------------
471483
RUN set -eux \
472484
&& blackfire version \

Dockerfiles/slim/Dockerfile-5.4

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN set -eux \
6666
dnsutils \
6767
iputils-ping \
6868
netcat-openbsd \
69+
sudo \
6970
&& rm -rf /var/lib/apt/lists/*
7071

7172
###
@@ -87,6 +88,11 @@ RUN set -eux \
8788
&& ping -V | grep ^ping \
8889
&& true
8990

91+
# -------------------- sudo --------------------
92+
RUN set -eux \
93+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
94+
&& true
95+
9096
# -------------------- blackfire --------------------
9197
RUN set -eux \
9298
&& apt-get update \
@@ -304,6 +310,7 @@ RUN set -eux \
304310
dnsutils \
305311
iputils-ping \
306312
netcat-openbsd \
313+
sudo \
307314
&& rm -rf /var/lib/apt/lists/*
308315

309316
###
@@ -467,6 +474,11 @@ RUN set -eux \
467474
&& ping -V | grep ^ping \
468475
&& true
469476

477+
# -------------------- sudo --------------------
478+
RUN set -eux \
479+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
480+
&& true
481+
470482
# -------------------- blackfire --------------------
471483
RUN set -eux \
472484
&& blackfire version \

Dockerfiles/slim/Dockerfile-5.5

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN set -eux \
6666
dnsutils \
6767
iputils-ping \
6868
netcat-openbsd \
69+
sudo \
6970
&& rm -rf /var/lib/apt/lists/*
7071

7172
###
@@ -87,6 +88,11 @@ RUN set -eux \
8788
&& ping -V | grep ^ping \
8889
&& true
8990

91+
# -------------------- sudo --------------------
92+
RUN set -eux \
93+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
94+
&& true
95+
9096
# -------------------- blackfire --------------------
9197
RUN set -eux \
9298
&& apt-get update \
@@ -304,6 +310,7 @@ RUN set -eux \
304310
dnsutils \
305311
iputils-ping \
306312
netcat-openbsd \
313+
sudo \
307314
&& rm -rf /var/lib/apt/lists/*
308315

309316
###
@@ -467,6 +474,11 @@ RUN set -eux \
467474
&& ping -V | grep ^ping \
468475
&& true
469476

477+
# -------------------- sudo --------------------
478+
RUN set -eux \
479+
&& sudo --version | grep -E 'version [0-9]+\.[0-9]+' \
480+
&& true
481+
470482
# -------------------- blackfire --------------------
471483
RUN set -eux \
472484
&& blackfire version \

0 commit comments

Comments
 (0)