diff --git a/CHANGELOG.md b/CHANGELOG.md index 2785c72..2f97241 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.127 + +#### Changed +- Adding `pdo_sqlsrv` to more PHP versions + + ## Release 0.126 #### Changed diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index f739db3..80dd2d7 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -490,6 +490,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 @@ -1029,6 +1040,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$' \ diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index 3047265..301a13f 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -45,6 +45,7 @@ RUN set -eux \ libyaml-dev \ libzip-dev \ snmp \ + unixodbc-dev \ zlib1g-dev \ ca-certificates \ git @@ -406,6 +407,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 @@ -514,6 +526,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 @@ -677,6 +700,7 @@ RUN set -eux \ libyaml-0-2 \ libzip4 \ snmp \ + unixodbc \ ca-certificates \ && rm -rf /var/lib/apt/lists/* \ \ @@ -807,6 +831,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$' \ @@ -840,6 +866,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/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index b575f04..13c7183 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -748,7 +748,7 @@ extensions_available: pdo_sqlite: already_avail: "{{ php_all_versions }}" pdo_sqlsrv: - disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0, 8.1] + disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1] 7.0: type: pecl version: 5.3.0 @@ -959,7 +959,7 @@ extensions_available: spl: already_avail: "{{ php_all_versions }}" sqlsrv: - disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0, 8.1] + disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.1] 7.0: type: pecl version: 5.3.0