Merge pull request #224 from devilbox/release-0.132

Release 0.132
2025-12-10 19:11:16 +00:00 · 2022-02-02 09:36:19 +01:00
parent f3e7f5d352 c818efe5e3
commit 928c712fa6
20 changed files with 95 additions and 59 deletions
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -40,7 +40,7 @@ jobs:
          - '8.1'
        refs:
          - 'master'
-          - '0.131'
+          - '0.132'
    steps:

      # ------------------------------------------------------------
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@
 ## Unreleased


+## Release 0.132
+
+#### Fixed
+- Fixed `nvm` PATH priority [#846](https://github.com/cytopia/devilbox/issues/846)
+
+#### Added
+- added extension `sqlsrv` to php 8.1
+- added extension `pdo_sqlsrv` to php 8.1
+
+#### Changed
+- Changed postfix hostname to `localhost` instead of GitHub runners long name
+
+
 ## Release 0.131

 #### Added
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -471,10 +471,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: pdo_sqlsrv --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install pdo_sqlsrv \
+	&& pecl install pdo_sqlsrv-5.9.0 \
 	# Enabling
 	&& docker-php-ext-enable pdo_sqlsrv \
 	&& true
@@ -616,10 +616,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: sqlsrv --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install sqlsrv \
+	&& pecl install sqlsrv-5.9.0 \
 	# Enabling
 	&& docker-php-ext-enable sqlsrv \
 	&& true
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -50,6 +50,7 @@ RUN set -eux \
 		libyaml-dev \
 		libzip-dev \
 		snmp \
+		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
 		ca-certificates \
@@ -423,6 +424,17 @@ RUN set -eux \
 	&& true


+# -------------------- Installing PHP Extension: pdo_sqlsrv --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install pdo_sqlsrv \
+	# Enabling
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& true
+
+
 # -------------------- Installing PHP Extension: pgsql --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -548,6 +560,17 @@ RUN set -eux \
 	&& true


+# -------------------- Installing PHP Extension: sqlsrv --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install sqlsrv \
+	# Enabling
+	&& docker-php-ext-enable sqlsrv \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -745,6 +768,7 @@ RUN set -eux \
 	libyaml-0-2 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	uuid \
 	ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -889,6 +913,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^psr$' \
@@ -924,6 +950,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
+	&& php -m | grep -oiE '^sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
--- a/Dockerfiles/prod/data/docker-entrypoint.d/301-postfix.sh
+++ b/Dockerfiles/prod/data/docker-entrypoint.d/301-postfix.sh
@@ -88,6 +88,7 @@ set_postfix() {

 		# Postfix catch-all
 		if [ "${enable_mail}" = "2" ]; then
+			run "postconf -e 'myhostname=localhost'" "${debug}"
 			run "postconf -e 'virtual_alias_maps=pcre:/etc/postfix/virtual'" "${debug}"
 			run "echo '/.*@.*/ ${username}' >> /etc/postfix/virtual" "${debug}"
 			run "newaliases" "${debug}"
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -427,10 +427,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -488,10 +488,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -522,10 +522,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -540,10 +540,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -553,10 +553,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -534,10 +534,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -533,10 +533,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -553,10 +553,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -554,10 +554,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -554,10 +554,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -469,10 +469,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -469,10 +469,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/README.md
+++ b/README.md
@@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules.
  <tr>
   <th>8.1</th>
   <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>
-   <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>
+   <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>
  </tr>
 </tbody>
 </table>
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -447,10 +447,10 @@ RUN set -eux \
 ###
 RUN \
 	{ \
-		echo 'PATH="${PATH}:${HOME}/.yarn/bin"'; \
-		echo 'PATH="${PATH}:${HOME}/.composer/vendor/bin"'; \
 		echo 'PATH="${PATH}:/usr/local/bin:/usr/local/sbin"'; \
-		echo 'PATH="${PATH}:/opt/nvm/versions/node/$(nvm version default)/bin"'; \
+		echo 'PATH="${HOME}/.yarn/bin:${PATH}"'; \
+		echo 'PATH="${HOME}/.composer/vendor/bin:${PATH}"'; \
+		echo 'PATH="/opt/nvm/versions/node/$(nvm version default)/bin:${PATH}"'; \
 		echo "export PATH"; \
 		echo ". /etc/bash-devilbox"; \
 		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
--- a/build/ansible/group_vars/all/mods.yml
+++ b/build/ansible/group_vars/all/mods.yml
@@ -788,22 +788,19 @@ extensions_available:
  pdo_sqlite:
    already_avail: "{{ php_all_versions }}"
  pdo_sqlsrv:
-    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1]
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
    7.0:
      type: pecl
      version: 5.3.0
-      build_dep: [unixodbc-dev]
-      run_dep: [unixodbc]
    7.1:
      type: pecl
      version: 5.6.1
-      build_dep: [unixodbc-dev]
-      run_dep: [unixodbc]
    7.2:
      type: pecl
      version: 5.8.1
-      build_dep: [unixodbc-dev]
-      run_dep: [unixodbc]
+    7.3:
+      type: pecl
+      version: 5.9.0
    all:
      type: pecl
      build_dep: [unixodbc-dev]
@@ -1018,22 +1015,19 @@ extensions_available:
  spl:
    already_avail: "{{ php_all_versions }}"
  sqlsrv:
-    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1]
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
    7.0:
      type: pecl
      version: 5.3.0
-      build_dep: [unixodbc-dev]
-      run_dep: [unixodbc]
    7.1:
      type: pecl
      version: 5.6.1
-      build_dep: [unixodbc-dev]
-      run_dep: [unixodbc]
    7.2:
      type: pecl
      version: 5.8.1
-      build_dep: [unixodbc-dev]
-      run_dep: [unixodbc]
+    7.3:
+      type: pecl
+      version: 5.9.0
    all:
      type: pecl
      build_dep: [unixodbc-dev]