From 4c852be4decb556adb1c6c8aeff71a8b1f2d15f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1nos=20Mik=C3=B3?= Date: Fri, 3 Jan 2025 15:31:16 +0100 Subject: [PATCH] chore: update shopware and magento install --- images/_php-fpm-common/shopware-web/bin/install.sh | 8 ++++++-- images/_php-fpm-common/shopware-web/bin/install_test.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/images/_php-fpm-common/shopware-web/bin/install.sh b/images/_php-fpm-common/shopware-web/bin/install.sh index 1fb6ba41..6a2f7bfb 100755 --- a/images/_php-fpm-common/shopware-web/bin/install.sh +++ b/images/_php-fpm-common/shopware-web/bin/install.sh @@ -411,12 +411,16 @@ shopware_admin_user() { } shopware_configure_redis() { + log "Configuring Redis" + mkdir -p "$(app_path)/config/packages" + if [[ "${SHOPWARE_REDIS_ENABLED:-false}" != "true" ]]; then + log "Redis is not enabled, disable redis config" + : >"$(app_path)/config/packages/zz-redis.yml" + return 0 fi - log "Configuring Redis" - mkdir -p "$(app_path)/config/packages" cat <"$(app_path)/config/packages/zz-redis.yml" framework: session: diff --git a/images/_php-fpm-common/shopware-web/bin/install_test.sh b/images/_php-fpm-common/shopware-web/bin/install_test.sh index 6da6bdbe..2e447db2 100644 --- a/images/_php-fpm-common/shopware-web/bin/install_test.sh +++ b/images/_php-fpm-common/shopware-web/bin/install_test.sh @@ -689,7 +689,7 @@ function test_shopware_configure_redis() { # Default shopware_configure_redis - assert_file_not_exists "${APP_PATH}/config/packages/zz-redis.yml" + assert_is_file_empty "${APP_PATH}/config/packages/zz-redis.yml" rm -fr './test-data' # Custom values