diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a80d46d..cf4bf09 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -40,7 +40,7 @@ jobs: - '8.1' refs: - 'master' - - '0.131' + - '0.132' steps: # ------------------------------------------------------------ diff --git a/CHANGELOG.md b/CHANGELOG.md index daaa8b2..ebe4e5d 100644 --- 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 diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 3404961..ae6050c 100644 --- 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 diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index f768635..6e25798 100644 --- 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$' \ diff --git a/Dockerfiles/prod/data/docker-entrypoint.d/301-postfix.sh b/Dockerfiles/prod/data/docker-entrypoint.d/301-postfix.sh index fe9d377..728a944 100755 --- 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}" diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 140eee3..29c9f41 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 8557aaf..6ec6df3 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 5f8293b..a13a0f8 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 856cbc7..021b2bc 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 1cfffeb..db50555 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index b574343..af23551 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 4601432..303d1c2 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 634a06a..6fbab8c 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 470d409..7735063 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 7aa5d88..00ec587 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 19d8847..0e46201 100644 --- 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"; \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 9d529fb..e2c3770 100644 --- 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"; \ diff --git a/README.md b/README.md index 93accc2..0af4822 100644 --- a/README.md +++ b/README.md @@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules.