From ad45665de1b67265ba6b89d3b3f2f1885a099bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 26 Jan 2026 15:26:03 +0100 Subject: [PATCH 1/4] IBX-10495: [Backport] Relaxed pattern for put index template step (4.6) --- 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 f5e9ea4..c1acf68 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -185,7 +185,7 @@ echo '> Clear cache & generate assets' docker compose --env-file=.env exec -T --user www-data app sh -c "composer run post-install-cmd --ansi" echo '> Install data' -if [[ "$COMPOSE_FILE" == *"elastic.yml"* ]]; then +if [[ "$COMPOSE_FILE" == *"elastic"*.yml ]]; then docker compose --env-file=.env exec -T --user www-data app sh -c "php bin/console ibexa:elasticsearch:put-index-template" fi 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" From 5546eef4a832455885fcb053a70b99a59e532faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 29 Jan 2026 08:51:46 +0100 Subject: [PATCH 2/4] Added ibexa/elasticsearch8 opt-in package to Node 20 setup --- bin/4.6.x-dev/prepare_project_edition.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/4.6.x-dev/prepare_project_edition.sh b/bin/4.6.x-dev/prepare_project_edition.sh index c1acf68..3034a47 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -124,6 +124,9 @@ if [[ "$PROJECT_EDITION" != "oss" ]]; then docker exec install_dependencies composer require ibexa/product-catalog-date-time-attribute:$PROJECT_VERSION --no-scripts --ansi --no-update docker exec install_dependencies composer require ibexa/product-catalog-symbol-attribute:$PROJECT_VERSION --no-scripts --ansi --no-update docker exec install_dependencies composer require ibexa/integrated-help:$PROJECT_VERSION --no-scripts --ansi --no-update + if [[ "$PHP_IMAGE" == *"node20"* ]]; then + docker exec install_dependencies composer require ibexa/elasticsearch8:$PROJECT_VERSION --no-scripts --ansi --no-update + fi fi if [[ "$PROJECT_EDITION" == "commerce" ]]; then docker exec install_dependencies composer require ibexa/discounts:$PROJECT_VERSION ibexa/discounts-codes:$PROJECT_VERSION --no-scripts --ansi --no-update From f3dbd63283f1b4618e72f082c500eca940817c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 29 Jan 2026 08:54:35 +0100 Subject: [PATCH 3/4] [tmp] branch from ES8 PR --- 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 3034a47..7d8bffa 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -125,7 +125,7 @@ if [[ "$PROJECT_EDITION" != "oss" ]]; then docker exec install_dependencies composer require ibexa/product-catalog-symbol-attribute:$PROJECT_VERSION --no-scripts --ansi --no-update docker exec install_dependencies composer require ibexa/integrated-help:$PROJECT_VERSION --no-scripts --ansi --no-update if [[ "$PHP_IMAGE" == *"node20"* ]]; then - docker exec install_dependencies composer require ibexa/elasticsearch8:$PROJECT_VERSION --no-scripts --ansi --no-update + docker exec install_dependencies composer require ibexa/elasticsearch8:"dev-support-es8 as 4.6.x-dev" --no-scripts --ansi --no-update fi fi if [[ "$PROJECT_EDITION" == "commerce" ]]; then From ae39bab9a667b9ff79c196ceef5aad8e3bc382b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 2 Feb 2026 11:56:27 +0100 Subject: [PATCH 4/4] Revert "[tmp] branch from ES8 PR" This reverts commit f3dbd63283f1b4618e72f082c500eca940817c7c. --- 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 7d8bffa..3034a47 100755 --- a/bin/4.6.x-dev/prepare_project_edition.sh +++ b/bin/4.6.x-dev/prepare_project_edition.sh @@ -125,7 +125,7 @@ if [[ "$PROJECT_EDITION" != "oss" ]]; then docker exec install_dependencies composer require ibexa/product-catalog-symbol-attribute:$PROJECT_VERSION --no-scripts --ansi --no-update docker exec install_dependencies composer require ibexa/integrated-help:$PROJECT_VERSION --no-scripts --ansi --no-update if [[ "$PHP_IMAGE" == *"node20"* ]]; then - docker exec install_dependencies composer require ibexa/elasticsearch8:"dev-support-es8 as 4.6.x-dev" --no-scripts --ansi --no-update + docker exec install_dependencies composer require ibexa/elasticsearch8:$PROJECT_VERSION --no-scripts --ansi --no-update fi fi if [[ "$PROJECT_EDITION" == "commerce" ]]; then