Skip to content

Commit 928c712

Browse files
cytopiacytopia
authored
Merge pull request #224 from devilbox/release-0.132
Release 0.132
2 parents f3e7f5d + c818efe commit 928c712

20 files changed

+95
-59
lines changed

‎.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- '8.1'
4141
refs:
4242
- 'master'
43-
- '0.131'
43+
- '0.132'
4444
steps:
4545

4646
# ------------------------------------------------------------

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
## Unreleased
55

66

7+
## Release 0.132
8+
9+
#### Fixed
10+
- Fixed `nvm` PATH priority [#846](https://github.com/cytopia/devilbox/issues/846)
11+
12+
#### Added
13+
- added extension `sqlsrv` to php 8.1
14+
- added extension `pdo_sqlsrv` to php 8.1
15+
16+
#### Changed
17+
- Changed postfix hostname to `localhost` instead of GitHub runners long name
18+
19+
720
## Release 0.131
821

922
#### Added

‎Dockerfiles/mods/Dockerfile-7.3

+4-4
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,10 @@ RUN set -eux \
471471

472472
# -------------------- Installing PHP Extension: pdo_sqlsrv --------------------
473473
RUN set -eux \
474-
# Installation: Generic
474+
# Installation: Version specific
475475
# Type: PECL extension
476476
# Default: Pecl command
477-
&& pecl install pdo_sqlsrv \
477+
&& pecl install pdo_sqlsrv-5.9.0 \
478478
# Enabling
479479
&& docker-php-ext-enable pdo_sqlsrv \
480480
&& true
@@ -616,10 +616,10 @@ RUN set -eux \
616616

617617
# -------------------- Installing PHP Extension: sqlsrv --------------------
618618
RUN set -eux \
619-
# Installation: Generic
619+
# Installation: Version specific
620620
# Type: PECL extension
621621
# Default: Pecl command
622-
&& pecl install sqlsrv \
622+
&& pecl install sqlsrv-5.9.0 \
623623
# Enabling
624624
&& docker-php-ext-enable sqlsrv \
625625
&& true

‎Dockerfiles/mods/Dockerfile-8.1

+28
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ RUN set -eux \
5050
libyaml-dev \
5151
libzip-dev \
5252
snmp \
53+
unixodbc-dev \
5354
uuid-dev \
5455
zlib1g-dev \
5556
ca-certificates \
@@ -423,6 +424,17 @@ RUN set -eux \
423424
&& true
424425

425426

427+
# -------------------- Installing PHP Extension: pdo_sqlsrv --------------------
428+
RUN set -eux \
429+
# Installation: Generic
430+
# Type: PECL extension
431+
# Default: Pecl command
432+
&& pecl install pdo_sqlsrv \
433+
# Enabling
434+
&& docker-php-ext-enable pdo_sqlsrv \
435+
&& true
436+
437+
426438
# -------------------- Installing PHP Extension: pgsql --------------------
427439
RUN set -eux \
428440
# Installation: Generic
@@ -548,6 +560,17 @@ RUN set -eux \
548560
&& true
549561

550562

563+
# -------------------- Installing PHP Extension: sqlsrv --------------------
564+
RUN set -eux \
565+
# Installation: Generic
566+
# Type: PECL extension
567+
# Default: Pecl command
568+
&& pecl install sqlsrv \
569+
# Enabling
570+
&& docker-php-ext-enable sqlsrv \
571+
&& true
572+
573+
551574
# -------------------- Installing PHP Extension: sysvmsg --------------------
552575
RUN set -eux \
553576
# Installation: Generic
@@ -745,6 +768,7 @@ RUN set -eux \
745768
libyaml-0-2 \
746769
libzip4 \
747770
snmp \
771+
unixodbc \
748772
uuid \
749773
ca-certificates \
750774
&& rm -rf /var/lib/apt/lists/* \
@@ -889,6 +913,8 @@ RUN set -eux \
889913
&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
890914
&& php -m | grep -oiE '^pdo_sqlite$' \
891915
&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
916+
&& php -m | grep -oiE '^pdo_sqlsrv$' \
917+
&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
892918
&& php -m | grep -oiE '^pgsql$' \
893919
&& php-fpm -m | grep -oiE '^pgsql$' \
894920
&& php -m | grep -oiE '^psr$' \
@@ -924,6 +950,8 @@ RUN set -eux \
924950
&& php-fpm -m | grep -oiE '^solr$' \
925951
&& php -m | grep -oiE '^spl$' \
926952
&& php-fpm -m | grep -oiE '^spl$' \
953+
&& php -m | grep -oiE '^sqlsrv$' \
954+
&& php-fpm -m | grep -oiE '^sqlsrv$' \
927955
&& php -m | grep -oiE '^sysvmsg$' \
928956
&& php-fpm -m | grep -oiE '^sysvmsg$' \
929957
&& php -m | grep -oiE '^sysvsem$' \

‎Dockerfiles/prod/data/docker-entrypoint.d/301-postfix.sh

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ set_postfix() {
8888

8989
# Postfix catch-all
9090
if [ "${enable_mail}" = "2" ]; then
91+
run "postconf -e 'myhostname=localhost'" "${debug}"
9192
run "postconf -e 'virtual_alias_maps=pcre:/etc/postfix/virtual'" "${debug}"
9293
run "echo '/.*@.*/ ${username}' >> /etc/postfix/virtual" "${debug}"
9394
run "newaliases" "${debug}"

‎Dockerfiles/work/Dockerfile-5.2

+3-3
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,10 @@ RUN set -eux \
427427
###
428428
RUN \
429429
{ \
430-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
431-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
432430
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
433-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
431+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
432+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
433+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
434434
echo "export PATH"; \
435435
echo ". /etc/bash-devilbox"; \
436436
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-5.3

+3-3
Original file line numberDiff line numberDiff line change
@@ -488,10 +488,10 @@ RUN set -eux \
488488
###
489489
RUN \
490490
{ \
491-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
492-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
493491
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
494-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
492+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
493+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
494+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
495495
echo "export PATH"; \
496496
echo ". /etc/bash-devilbox"; \
497497
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-5.4

+3-3
Original file line numberDiff line numberDiff line change
@@ -522,10 +522,10 @@ RUN set -eux \
522522
###
523523
RUN \
524524
{ \
525-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
526-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
527525
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
528-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
526+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
527+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
528+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
529529
echo "export PATH"; \
530530
echo ". /etc/bash-devilbox"; \
531531
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-5.5

+3-3
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,10 @@ RUN set -eux \
540540
###
541541
RUN \
542542
{ \
543-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
544-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
545543
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
546-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
544+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
545+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
546+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
547547
echo "export PATH"; \
548548
echo ". /etc/bash-devilbox"; \
549549
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-5.6

+3-3
Original file line numberDiff line numberDiff line change
@@ -553,10 +553,10 @@ RUN set -eux \
553553
###
554554
RUN \
555555
{ \
556-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
557-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
558556
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
559-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
557+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
558+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
559+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
560560
echo "export PATH"; \
561561
echo ". /etc/bash-devilbox"; \
562562
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-7.0

+3-3
Original file line numberDiff line numberDiff line change
@@ -534,10 +534,10 @@ RUN set -eux \
534534
###
535535
RUN \
536536
{ \
537-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
538-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
539537
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
540-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
538+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
539+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
540+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
541541
echo "export PATH"; \
542542
echo ". /etc/bash-devilbox"; \
543543
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-7.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -533,10 +533,10 @@ RUN set -eux \
533533
###
534534
RUN \
535535
{ \
536-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
537-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
538536
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
539-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
537+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
538+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
539+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
540540
echo "export PATH"; \
541541
echo ". /etc/bash-devilbox"; \
542542
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-7.2

+3-3
Original file line numberDiff line numberDiff line change
@@ -553,10 +553,10 @@ RUN set -eux \
553553
###
554554
RUN \
555555
{ \
556-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
557-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
558556
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
559-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
557+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
558+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
559+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
560560
echo "export PATH"; \
561561
echo ". /etc/bash-devilbox"; \
562562
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-7.3

+3-3
Original file line numberDiff line numberDiff line change
@@ -554,10 +554,10 @@ RUN set -eux \
554554
###
555555
RUN \
556556
{ \
557-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
558-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
559557
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
560-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
558+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
559+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
560+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
561561
echo "export PATH"; \
562562
echo ". /etc/bash-devilbox"; \
563563
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-7.4

+3-3
Original file line numberDiff line numberDiff line change
@@ -554,10 +554,10 @@ RUN set -eux \
554554
###
555555
RUN \
556556
{ \
557-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
558-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
559557
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
560-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
558+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
559+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
560+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
561561
echo "export PATH"; \
562562
echo ". /etc/bash-devilbox"; \
563563
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-8.0

+3-3
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,10 @@ RUN set -eux \
469469
###
470470
RUN \
471471
{ \
472-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
473-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
474472
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
475-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
473+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
474+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
475+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
476476
echo "export PATH"; \
477477
echo ". /etc/bash-devilbox"; \
478478
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎Dockerfiles/work/Dockerfile-8.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,10 @@ RUN set -eux \
469469
###
470470
RUN \
471471
{ \
472-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
473-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
474472
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
475-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
473+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
474+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
475+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
476476
echo "export PATH"; \
477477
echo ". /etc/bash-devilbox"; \
478478
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules.
685685
<tr>
686686
<th>8.1</th>
687687
<td id="81-base">Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
688-
<td id="81-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
688+
<td id="81-mods">amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
689689
</tr>
690690
</tbody>
691691
</table>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -447,10 +447,10 @@ RUN set -eux \
447447
###
448448
RUN \
449449
{ \
450-
echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
451-
echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
452450
echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
453-
echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
451+
echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
452+
echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
453+
echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
454454
echo "export PATH"; \
455455
echo ". /etc/bash-devilbox"; \
456456
echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \

‎build/ansible/group_vars/all/mods.yml

+8-14
Original file line numberDiff line numberDiff line change
@@ -788,22 +788,19 @@ extensions_available:
788788
pdo_sqlite:
789789
already_avail: "{{ php_all_versions }}"
790790
pdo_sqlsrv:
791-
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1]
791+
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
792792
7.0:
793793
type: pecl
794794
version: 5.3.0
795-
build_dep: [unixodbc-dev]
796-
run_dep: [unixodbc]
797795
7.1:
798796
type: pecl
799797
version: 5.6.1
800-
build_dep: [unixodbc-dev]
801-
run_dep: [unixodbc]
802798
7.2:
803799
type: pecl
804800
version: 5.8.1
805-
build_dep: [unixodbc-dev]
806-
run_dep: [unixodbc]
801+
7.3:
802+
type: pecl
803+
version: 5.9.0
807804
all:
808805
type: pecl
809806
build_dep: [unixodbc-dev]
@@ -1018,22 +1015,19 @@ extensions_available:
10181015
spl:
10191016
already_avail: "{{ php_all_versions }}"
10201017
sqlsrv:
1021-
disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1]
1018+
disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
10221019
7.0:
10231020
type: pecl
10241021
version: 5.3.0
1025-
build_dep: [unixodbc-dev]
1026-
run_dep: [unixodbc]
10271022
7.1:
10281023
type: pecl
10291024
version: 5.6.1
1030-
build_dep: [unixodbc-dev]
1031-
run_dep: [unixodbc]
10321025
7.2:
10331026
type: pecl
10341027
version: 5.8.1
1035-
build_dep: [unixodbc-dev]
1036-
run_dep: [unixodbc]
1028+
7.3:
1029+
type: pecl
1030+
version: 5.9.0
10371031
all:
10381032
type: pecl
10391033
build_dep: [unixodbc-dev]

0 commit comments

Comments
 (0)