Skip to content

Commit

Permalink
Merge pull request #266 from devilbox/release-0.149
Browse files Browse the repository at this point in the history
Release 0.149
  • Loading branch information
cytopia authored Dec 28, 2022
2 parents 8e71550 + 393ecc5 commit 26c4fb5
Show file tree
Hide file tree
Showing 19 changed files with 196 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .ansible/group_vars/all/work.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ tools_enabled:
- linkcheck
- mdlint
- mupdf-tools
- net-tools
- phalcon-devtools
- php-cs-fixer
- phpcbf
Expand Down Expand Up @@ -337,6 +338,12 @@ tools_available:
all:
type: apt
package: mupdf-tools
net-tools:
disabled: []
check: netstat --version | grep net-tools || (netstat --version; false)
all:
type: apt
package: net-tools
phalcon-devtools:
disabled: [5.2, 5.3, 5.4, 8.2]
check: |
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
## Unreleased


## Release 0.149

### Added
- Added `net-tools` package


## Release 0.148

### Added
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-5.2
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -360,6 +361,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) phpcbf --------------------
RUN set -eux \
&& PHPCBF_URL="https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar" \
Expand Down Expand Up @@ -523,6 +529,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -651,6 +658,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) phpcbf --------------------
RUN set -eux \
&& phpcbf --version | grep -E 'version [0-9][.0-9]+' || (phpcbf --version; false) \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-5.3
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -395,6 +396,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar" \
Expand Down Expand Up @@ -596,6 +602,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -724,6 +731,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' || (php-cs-fixer --version; false) \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-5.4
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -418,6 +419,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar" \
Expand Down Expand Up @@ -619,6 +625,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -762,6 +769,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (custom) php-cs-fixer --------------------
RUN set -eux \
&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' || (php-cs-fixer --version; false) \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-5.5
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -434,6 +435,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down Expand Up @@ -674,6 +680,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -827,6 +834,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-5.6
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -442,6 +443,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down Expand Up @@ -707,6 +713,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -860,6 +867,11 @@ RUN set -eux \
\
&& true

# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true

# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-7.0
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -442,6 +443,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down Expand Up @@ -707,6 +713,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -860,6 +867,11 @@ RUN set -eux \
\
&& true

# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true

# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-7.1
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -442,6 +443,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down Expand Up @@ -707,6 +713,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -860,6 +867,11 @@ RUN set -eux \
\
&& true

# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true

# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-7.2
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -442,6 +443,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down Expand Up @@ -707,6 +713,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -860,6 +867,11 @@ RUN set -eux \
\
&& true

# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true

# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down
12 changes: 12 additions & 0 deletions Dockerfiles/work/Dockerfile-7.3
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -442,6 +443,11 @@ RUN set -eux \
\
&& true
# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true
# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down Expand Up @@ -707,6 +713,7 @@ RUN set -eux \
git \
jq \
mupdf-tools \
net-tools \
openssh-client \
rsync \
shellcheck \
Expand Down Expand Up @@ -860,6 +867,11 @@ RUN set -eux \
\
&& true

# -------------------- (apt) net-tools --------------------
RUN set -eux \
&& netstat --version | grep net-tools || (netstat --version; false) \
&& true

# -------------------- (composer) phalcon-devtools --------------------
RUN set -eux \
&& if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \
Expand Down
Loading

0 comments on commit 26c4fb5

Please sign in to comment.