From 760cab13d15cfc43da050bd63d58fbcd10c11591 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Wed, 25 Oct 2023 17:10:07 +0200 Subject: [PATCH] Bump to 8.3.0RC4 Note we are also upgrading to msodbc18. And going back to the debian 10 MS repository. Debian 12 still is missing the PGP keys and debian 11 has stopped working with the RC4 image. Not really sure what is going with their apt repos. Not working yet: - solr extension (https://github.com/php/pecl-search_engine-solr) --- Dockerfile | 2 +- README.md | 2 +- root/tmp/setup/sqlsrv-extension.sh | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd3d71a..9a9e96a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.0RC3-apache-bookworm +FROM php:8.3.0RC4-apache-bookworm # So we can use it anywhere for conditional stuff. Keeping BC with old (non-buildkit, builders) ARG TARGETPLATFORM diff --git a/README.md b/README.md index c9c0d4b..41a942a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Moodle PHP environment configured for Moodle development based on [Official PH | PHP Version | Variant | Tags | Status | Notes | |--------------|---------|------------------|--------|-------| -| PHP 8.3 | Bookworm| dev| [![Test and publish 8.3](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml/badge.svg?branch=master)](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml)|8.3.0rc3, testing| +| PHP 8.3 | Bookworm| dev| [![Test and publish 8.3](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml/badge.svg?branch=master)](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml)|8.3.0rc4, testing| | PHP 8.2 | Bookworm | 8.2, 8.2-bookworm| [![Test and publish 8.2](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml/badge.svg?branch=8.2-bookworm)](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml)| | PHP 8.1 | Bookworm | 8.1, 8.1-bookworm | [![Test and publish 8.1](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml/badge.svg?branch=8.1-bookworm)](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml)| | PHP 8.2 | Bullseye| 8.2-bullseye| [![Test and publish 8.2](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml/badge.svg?branch=8.2-bullseye)](https://github.com/moodlehq/moodle-php-apache/actions/workflows/test_buildx_and_publish.yml)| diff --git a/root/tmp/setup/sqlsrv-extension.sh b/root/tmp/setup/sqlsrv-extension.sh index d173e8f..49e9f52 100755 --- a/root/tmp/setup/sqlsrv-extension.sh +++ b/root/tmp/setup/sqlsrv-extension.sh @@ -26,16 +26,17 @@ echo "Downloading sqlsrv files" curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - # TODO, bookworm should be 12, but the msodbcsql17 package is not available yet, hence using bullseye (11) one. # (see https://learn.microsoft.com/en-us/answers/questions/1328834/debian-12-public-key-is-not-available) -curl https://packages.microsoft.com/config/debian/11/prod.list -o /etc/apt/sources.list.d/mssql-release.list +# Also, with 8.3-RC4, the bullseye (11) has stopped to build ok. So using 10 (buster) for now. +curl https://packages.microsoft.com/config/debian/10/prod.list -o /etc/apt/sources.list.d/mssql-release.list apt-get update echo "Install msodbcsql" -ACCEPT_EULA=Y apt-get install -y msodbcsql17 +ACCEPT_EULA=Y apt-get install -y msodbcsql18 -ln -fsv /opt/mssql-tools/bin/* /usr/bin +ln -fsv /opt/mssql-tools18/bin/* /usr/bin # Need 5.11 (or later) for PHP 8.2 support -pecl install sqlsrv-5.11.0 +pecl install sqlsrv-5.11.1 docker-php-ext-enable sqlsrv # Keep our image size down..