Merge pull request #135 from junpataleta/500_DB_requirements

Bump DBTAG versions
moodlehq · Nov 28, 2024 · 54e8c82 · 54e8c82
2 parents 450e412 + a9b33b0
commit 54e8c82
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/runner/main/modules/docker-database/docker-database.sh b/runner/main/modules/docker-database/docker-database.sh
@@ -131,10 +131,10 @@ function database_apply_default_dbtag() {
     if [[ "${DBTAG}" == "auto" ]]; then
         case ${DBTYPE} in
             mariadb)
-                DBTAG=10.7 # Because there is a problem with the >= 10.8 images not working with older hosts OS.
+                DBTAG=10.11 # Because it's the primary lowest supported version and we need it covered by default.
                 ;;
             mysqli)
-                DBTAG=8.0 # Because it's the primary lowest supported version and we need it covered by default.
+                DBTAG=8.4 # Because it's the primary lowest supported version and we need it covered by default.
                 ;;
             sqlsrv)
                 DBTAG=latest # No pin, right now 2019-latest
@@ -143,7 +143,7 @@ function database_apply_default_dbtag() {
                 DBTAG=latest # No pin, right now this is 21c
                 ;;
             pgsql)
-                DBTAG=13 # Because it's the primary lowest supported version and we need it covered by default.
+                DBTAG=14 # Because it's the primary lowest supported version and we need it covered by default.
                 ;;
             *)
                 exit_error "Wrong DBTYPE: ${DBTYPE}. Fix it, or add support for that DBTYPE above"
@@ -183,4 +183,4 @@ function database_apply_config() {
             exit_error "Wrong DBTYPE: ${DBTYPE}. Fix it, or add support for that DBTYPE above"
             ;;
     esac
-}
+}
diff --git a/runner/main/modules/docker-database/mysqli.d/primary/conf.d/primary.cnf b/runner/main/modules/docker-database/mysqli.d/primary/conf.d/primary.cnf
@@ -6,7 +6,6 @@ innodb_file_per_table = 1
 
 character-set-server = utf8mb4
 collation-server = utf8mb4_bin
-skip-character-set-client-handshake
 
 key_buffer_size = 768M
 table_open_cache = 12000

diff --git a/runner/main/modules/docker-database/mysqli.d/replica/conf.d/moodle.cnf b/runner/main/modules/docker-database/mysqli.d/replica/conf.d/moodle.cnf
@@ -6,7 +6,6 @@ innodb_file_per_table = 1
 
 character-set-server = utf8mb4
 collation-server = utf8mb4_bin
-skip-character-set-client-handshake
 
 key_buffer_size = 768M
 table_open_cache = 12000

diff --git a/runner/main/modules/docker-database/mysqli.d/standalone/conf.d/moodle.cnf b/runner/main/modules/docker-database/mysqli.d/standalone/conf.d/moodle.cnf
@@ -8,7 +8,6 @@ skip-log-bin
 
 character-set-server = utf8mb4
 collation-server = utf8mb4_bin
-skip-character-set-client-handshake
 
 key_buffer_size = 768M
 table_open_cache = 12000

diff --git a/runner/main/modules/docker-php/docker-php.sh b/runner/main/modules/docker-php/docker-php.sh
@@ -39,7 +39,7 @@ function docker-php_check() {
 # Docker module init.
 function docker-php_config() {
     # Apply some defaults (always set to the minimum version supported in the main branch).
-    PHP_VERSION="${PHP_VERSION:-8.1}"
+    PHP_VERSION="${PHP_VERSION:-8.2}"
     DOCKER_PHP="${DOCKER_PHP:-moodlehq/moodle-php-apache:${PHP_VERSION}}"
     WEBSERVER=webserver"${UUID}"
 }

diff --git a/test/phpunit_test.bats b/test/phpunit_test.bats
@@ -74,7 +74,7 @@ teardown() {
     run launch_runner
     assert_success
     assert_output --partial "== JOBTYPE: phpunit"
-    assert_output --partial "== PHP version: 8.1"
+    assert_output --partial "== PHP version: 8.2"
     assert_output --partial "== DBTYPE: mysqli"
     assert_output --partial "== PHPUNIT_FILTER: label"
     assert_output --partial "== DBREPLICAS: 0"