Skip to content

Commit 54e8c82

Browse files
authored
Merge pull request #135 from junpataleta/500_DB_requirements
Bump DBTAG versions
2 parents 450e412 + a9b33b0 commit 54e8c82

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

runner/main/modules/docker-database/docker-database.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ function database_apply_default_dbtag() {
131131
if [[ "${DBTAG}" == "auto" ]]; then
132132
case ${DBTYPE} in
133133
mariadb)
134-
DBTAG=10.7 # Because there is a problem with the >= 10.8 images not working with older hosts OS.
134+
DBTAG=10.11 # Because it's the primary lowest supported version and we need it covered by default.
135135
;;
136136
mysqli)
137-
DBTAG=8.0 # Because it's the primary lowest supported version and we need it covered by default.
137+
DBTAG=8.4 # Because it's the primary lowest supported version and we need it covered by default.
138138
;;
139139
sqlsrv)
140140
DBTAG=latest # No pin, right now 2019-latest
@@ -143,7 +143,7 @@ function database_apply_default_dbtag() {
143143
DBTAG=latest # No pin, right now this is 21c
144144
;;
145145
pgsql)
146-
DBTAG=13 # Because it's the primary lowest supported version and we need it covered by default.
146+
DBTAG=14 # Because it's the primary lowest supported version and we need it covered by default.
147147
;;
148148
*)
149149
exit_error "Wrong DBTYPE: ${DBTYPE}. Fix it, or add support for that DBTYPE above"
@@ -183,4 +183,4 @@ function database_apply_config() {
183183
exit_error "Wrong DBTYPE: ${DBTYPE}. Fix it, or add support for that DBTYPE above"
184184
;;
185185
esac
186-
}
186+
}

runner/main/modules/docker-database/mysqli.d/primary/conf.d/primary.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ innodb_file_per_table = 1
66

77
character-set-server = utf8mb4
88
collation-server = utf8mb4_bin
9-
skip-character-set-client-handshake
109

1110
key_buffer_size = 768M
1211
table_open_cache = 12000

runner/main/modules/docker-database/mysqli.d/replica/conf.d/moodle.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ innodb_file_per_table = 1
66

77
character-set-server = utf8mb4
88
collation-server = utf8mb4_bin
9-
skip-character-set-client-handshake
109

1110
key_buffer_size = 768M
1211
table_open_cache = 12000

runner/main/modules/docker-database/mysqli.d/standalone/conf.d/moodle.cnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ skip-log-bin
88

99
character-set-server = utf8mb4
1010
collation-server = utf8mb4_bin
11-
skip-character-set-client-handshake
1211

1312
key_buffer_size = 768M
1413
table_open_cache = 12000

runner/main/modules/docker-php/docker-php.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function docker-php_check() {
3939
# Docker module init.
4040
function docker-php_config() {
4141
# Apply some defaults (always set to the minimum version supported in the main branch).
42-
PHP_VERSION="${PHP_VERSION:-8.1}"
42+
PHP_VERSION="${PHP_VERSION:-8.2}"
4343
DOCKER_PHP="${DOCKER_PHP:-moodlehq/moodle-php-apache:${PHP_VERSION}}"
4444
WEBSERVER=webserver"${UUID}"
4545
}

test/phpunit_test.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ teardown() {
7474
run launch_runner
7575
assert_success
7676
assert_output --partial "== JOBTYPE: phpunit"
77-
assert_output --partial "== PHP version: 8.1"
77+
assert_output --partial "== PHP version: 8.2"
7878
assert_output --partial "== DBTYPE: mysqli"
7979
assert_output --partial "== PHPUNIT_FILTER: label"
8080
assert_output --partial "== DBREPLICAS: 0"

0 commit comments

Comments
 (0)