From 1ad3bb7e020ce85270bd10e9413d1faa1ac356db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 18 Nov 2025 17:25:02 +0100 Subject: [PATCH 1/2] IBX-10946: Adjust display database version --- bin/4.6.x-dev/prepare_project_edition.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/4.6.x-dev/prepare_project_edition.sh b/bin/4.6.x-dev/prepare_project_edition.sh index c2095be..d0466d8 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -192,6 +192,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol echo '> Display database version for debugging' if [[ "$COMPOSE_FILE" == *"db-postgresql"*.yml ]]; then docker exec ibexa-db-1 sh -c "psql -V" +elif [[ "$COMPOSE_FILE" == *"db-mariadb"*.yml ]]; then + docker exec ibexa-db-1 sh -c "mariadb --version" else docker exec ibexa-db-1 sh -c "mysql -V" fi From a52eaff95275b3e873886a018f7f47e6b36feb50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 25 Nov 2025 15:52:57 +0100 Subject: [PATCH 2/2] Covered other versions --- bin/5.0.x-dev/prepare_project_edition.sh | 2 ++ bin/^3.3.x-dev/prepare_project_edition.sh | 2 ++ bin/stable/prepare_project_edition.sh | 2 ++ 3 files changed, 6 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index bec1942..910afd6 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -172,6 +172,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol echo '> Display database version for debugging' if [[ "$COMPOSE_FILE" == *"db-postgresql"*.yml ]]; then docker exec ibexa-db-1 sh -c "psql -V" +elif [[ "$COMPOSE_FILE" == *"db-mariadb"*.yml ]]; then + docker exec ibexa-db-1 sh -c "mariadb --version" else docker exec ibexa-db-1 sh -c "mysql -V" fi diff --git a/bin/^3.3.x-dev/prepare_project_edition.sh b/bin/^3.3.x-dev/prepare_project_edition.sh index aa614f2..e6db972 100644 --- a/bin/^3.3.x-dev/prepare_project_edition.sh +++ b/bin/^3.3.x-dev/prepare_project_edition.sh @@ -166,6 +166,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol echo '> Display database version for debugging' if [[ "$COMPOSE_FILE" == *"db-postgresql"*.yml ]]; then docker exec ibexa-db-1 sh -c "psql -V" +elif [[ "$COMPOSE_FILE" == *"db-mariadb"*.yml ]]; then + docker exec ibexa-db-1 sh -c "mariadb --version" else docker exec ibexa-db-1 sh -c "mysql -V" fi diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index c651efd..0405870 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -102,6 +102,8 @@ docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/consol echo '> Display database version for debugging' if [[ "$COMPOSE_FILE" == *"db-postgresql"*.yml ]]; then docker exec ibexa-db-1 sh -c "psql -V" +elif [[ "$COMPOSE_FILE" == *"db-mariadb"*.yml ]]; then + docker exec ibexa-db-1 sh -c "mariadb --version" else docker exec ibexa-db-1 sh -c "mysql -V" fi