From c735ffcd7255dfe2103aa827314c0b910f98adb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 2 Sep 2025 11:43:04 +0200 Subject: [PATCH 1/6] IBX-10493: Display Redis version for debugging --- bin/4.6.x-dev/prepare_project_edition.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/4.6.x-dev/prepare_project_edition.sh b/bin/4.6.x-dev/prepare_project_edition.sh index c5beaef..ac82ced 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -195,6 +195,11 @@ else docker exec ibexa-db-1 sh -c "mysql -V" fi +echo '> Display Redis version for debugging' +if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then + docker exec ibexa-redis-1 sh -c "redis-cli --version" +fi + echo '> Generate GraphQL schema' docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" From 16b2debe26bd681b576fe95cbaa9cd1a58511882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 2 Sep 2025 12:58:34 +0200 Subject: [PATCH 2/6] Print to log only when used --- bin/4.6.x-dev/prepare_project_edition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/4.6.x-dev/prepare_project_edition.sh b/bin/4.6.x-dev/prepare_project_edition.sh index ac82ced..dbabcf8 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -195,8 +195,8 @@ else docker exec ibexa-db-1 sh -c "mysql -V" fi -echo '> Display Redis version for debugging' if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then + echo '> Display Redis version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" fi From 532ebcadbe2ed273d311447851ef1d868da1ebac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 2 Sep 2025 13:03:53 +0200 Subject: [PATCH 3/6] Display Redis version for debugging (3.3, 5.0) --- bin/5.0.x-dev/prepare_project_edition.sh | 5 +++++ bin/^3.3.x-dev/prepare_project_edition.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index f5f9d92..2559c7a 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -177,6 +177,11 @@ else docker exec ibexa-db-1 sh -c "mysql -V" fi +if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then + echo '> Display Redis version for debugging' + docker exec ibexa-redis-1 sh -c "redis-cli --version" +fi + echo '> Generate GraphQL schema' docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" diff --git a/bin/^3.3.x-dev/prepare_project_edition.sh b/bin/^3.3.x-dev/prepare_project_edition.sh index bda5cd6..9f280d5 100644 --- a/bin/^3.3.x-dev/prepare_project_edition.sh +++ b/bin/^3.3.x-dev/prepare_project_edition.sh @@ -164,6 +164,11 @@ echo '> Install data' docker compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console ibexa:install --skip-indexing" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:reindex" +if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then + echo '> Display Redis version for debugging' + docker exec ibexa-redis-1 sh -c "redis-cli --version" +fi + echo '> Generate GraphQL schema' docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema" From da42b2bad69ba5a4f2867fc4d5d977e9c0b58085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 2 Sep 2025 13:05:03 +0200 Subject: [PATCH 4/6] Display database version for debugging (3.3) --- bin/^3.3.x-dev/prepare_project_edition.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bin/^3.3.x-dev/prepare_project_edition.sh b/bin/^3.3.x-dev/prepare_project_edition.sh index 9f280d5..8bd59e5 100644 --- a/bin/^3.3.x-dev/prepare_project_edition.sh +++ b/bin/^3.3.x-dev/prepare_project_edition.sh @@ -164,6 +164,13 @@ echo '> Install data' docker compose --env-file=.env exec -T --user www-data app sh -c "php /scripts/wait_for_db.php; php bin/console ibexa:install --skip-indexing" docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:reindex" +echo '> Display database version for debugging' +if [[ "$COMPOSE_FILE" == *"db-postgresql.yml"* ]]; then + docker exec ibexa-db-1 sh -c "psql -V" +else + docker exec ibexa-db-1 sh -c "mysql -V" +fi + if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then echo '> Display Redis version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" From 6ae8cc836042dd7e2a06c831f732d82420dac12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 2 Sep 2025 15:29:26 +0200 Subject: [PATCH 5/6] Relax pattern --- bin/4.6.x-dev/prepare_project_edition.sh | 2 +- bin/5.0.x-dev/prepare_project_edition.sh | 2 +- bin/^3.3.x-dev/prepare_project_edition.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/4.6.x-dev/prepare_project_edition.sh b/bin/4.6.x-dev/prepare_project_edition.sh index dbabcf8..be36809 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -195,7 +195,7 @@ else docker exec ibexa-db-1 sh -c "mysql -V" fi -if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then +if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then echo '> Display Redis version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" fi diff --git a/bin/5.0.x-dev/prepare_project_edition.sh b/bin/5.0.x-dev/prepare_project_edition.sh index 2559c7a..431a6d3 100755 --- a/bin/5.0.x-dev/prepare_project_edition.sh +++ b/bin/5.0.x-dev/prepare_project_edition.sh @@ -177,7 +177,7 @@ else docker exec ibexa-db-1 sh -c "mysql -V" fi -if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then +if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then echo '> Display Redis version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" fi diff --git a/bin/^3.3.x-dev/prepare_project_edition.sh b/bin/^3.3.x-dev/prepare_project_edition.sh index 8bd59e5..9e5de94 100644 --- a/bin/^3.3.x-dev/prepare_project_edition.sh +++ b/bin/^3.3.x-dev/prepare_project_edition.sh @@ -171,7 +171,7 @@ else docker exec ibexa-db-1 sh -c "mysql -V" fi -if [[ "$COMPOSE_FILE" == *"redis.yml"* ]]; then +if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then echo '> Display Redis version for debugging' docker exec ibexa-redis-1 sh -c "redis-cli --version" fi From 9017df8ef9705d7614ff5255a576fd2eebc46c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 3 Sep 2025 15:56:59 +0200 Subject: [PATCH 6/6] Display Redis version for debugging (stable) --- bin/stable/prepare_project_edition.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/stable/prepare_project_edition.sh b/bin/stable/prepare_project_edition.sh index 9d5f6bd..314c9a6 100755 --- a/bin/stable/prepare_project_edition.sh +++ b/bin/stable/prepare_project_edition.sh @@ -104,6 +104,11 @@ else docker exec ibexa-db-1 sh -c "mysql -V" fi +if [[ "$COMPOSE_FILE" == *"redis"*.yml ]]; then + echo '> Display Redis version for debugging' + docker exec ibexa-redis-1 sh -c "redis-cli --version" +fi + echo '> Generate GraphQL schema' docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:graphql:generate-schema"