From 799d88560fc3a910b59b70626112d26015389da2 Mon Sep 17 00:00:00 2001 From: Martin Eiber Date: Fri, 19 May 2023 12:20:58 +0200 Subject: [PATCH] Switch to Pimcore 11 (#10) * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * Switch to pimcore 11 * updated for Pimcore 11 and fixed #11 * fix shutdown * fix shutdown * updated versions * Update .github/scripts/01-setup-environment.sh --------- Co-authored-by: Christian Fasching Co-authored-by: Christian Fasching --- .github/files/.env.local | 15 +----- .github/files/bundles.php | 35 +++++++------ .../files/config-advanced-object-search.yaml | 2 - .github/files/config-config.yaml | 50 ++++++++++++++++++ .github/files/config-datahub.yaml | 2 - .github/files/config-system.yaml | 16 +++++- .github/files/docker-compose.override.yaml | 12 ++++- .github/files/supervisord.conf | 4 +- .github/scripts/00-localsetup.sh | 1 - .github/scripts/01-setup-environment.sh | 21 ++++++-- .github/scripts/02-install-pimcore.sh | 21 ++++++-- .github/scripts/04-shutdown.sh | 2 +- .github/workflows/integration-test.yml | 2 +- composer.json | 52 +++++++++++-------- 14 files changed, 164 insertions(+), 71 deletions(-) create mode 100644 .github/files/config-config.yaml diff --git a/.github/files/.env.local b/.github/files/.env.local index 2a96ecd..98d2a5b 100644 --- a/.github/files/.env.local +++ b/.github/files/.env.local @@ -1,15 +1,2 @@ APP_ENV=prod -APP_DEBUG=false - -PIMCORE_WRITE_TARGET_IMAGE_THUMBNAILS=settings-store -PIMCORE_WRITE_TARGET_CUSTOM_REPORTS=settings-store -PIMCORE_WRITE_TARGET_VIDEO_THUMBNAILS=settings-store -PIMCORE_WRITE_TARGET_DOCUMENT_TYPES=settings-store -PIMCORE_WRITE_TARGET_WEB_TO_PRINT=settings-store -PIMCORE_WRITE_TARGET_PREDEFINED_PROPERTIES=settings-store -PIMCORE_WRITE_TARGET_PREDEFINED_ASSET_METADATA=settings-store -PIMCORE_WRITE_TARGET_STATICROUTES=settings-store -PIMCORE_WRITE_TARGET_PERSPECTIVES=settings-store -PIMCORE_WRITE_TARGET_CUSTOM_VIEWS=settings-store -PIMCORE_WRITE_TARGET_DATA_HUB=settings-store -PIMCORE_WRITE_TARGET_OBJECT_CUSTOM_LAYOUTS=settings-store \ No newline at end of file +APP_DEBUG=false \ No newline at end of file diff --git a/.github/files/bundles.php b/.github/files/bundles.php index ca49e99..f5f67e0 100644 --- a/.github/files/bundles.php +++ b/.github/files/bundles.php @@ -1,21 +1,24 @@ ['all' => true], -// \Pimcore\Bundle\SeoBundle\PimcoreSeoBundle::class => ['all' => true], -// \Pimcore\Bundle\SimpleBackendSearchBundle\PimcoreSimpleBackendSearchBundle::class => ['all' => true], -// \Pimcore\Bundle\CustomReportsBundle\PimcoreCustomReportsBundle::class => ['all' => true], -// \Pimcore\Bundle\ApplicationLoggerBundle\PimcoreApplicationLoggerBundle::class => ['all' => true], -// \Pimcore\Bundle\PersonalizationBundle\PimcorePersonalizationBundle::class => ['all' => true], -// \Pimcore\Bundle\WebToPrintBundle\PimcoreWebToPrintBundle\PimcoreWebToPrintBundle::class => ['all' => true], -// \Pimcore\Bundle\StaticRoutesBundle\PimcoreStaticRoutesBundle::class => ['all' => true], -// \Pimcore\Bundle\FileExplorerBundle\PimcoreFileExplorerBundle::class => ['all' => true], -// \Pimcore\Bundle\SystemInfoBundle\PimcoreSystemInfoBundle::class => ['all' => true], -// \Pimcore\Bundle\WordExportBundle\PimcoreWordExportBundle::class => ['all' => true], -// \Pimcore\Bundle\XliffBundle\PimcoreXliffBundle::class => ['all' => true], +// \Pimcore\Bundle\EcommerceFrameworkBundle\PimcoreEcommerceFrameworkBundle::class => ['all' => true], + \Pimcore\Bundle\PersonalizationBundle\PimcorePersonalizationBundle::class => ['all' => true], + \Pimcore\Bundle\GlossaryBundle\PimcoreGlossaryBundle::class => ['all' => true], + \Pimcore\Bundle\SeoBundle\PimcoreSeoBundle::class => ['all' => true], + \Pimcore\Bundle\SimpleBackendSearchBundle\PimcoreSimpleBackendSearchBundle::class => ['all' => true], + \Pimcore\Bundle\CustomReportsBundle\PimcoreCustomReportsBundle::class => ['all' => true], + \Pimcore\Bundle\GoogleMarketingBundle\PimcoreGoogleMarketingBundle::class => ['all' => true], + \Pimcore\Bundle\ApplicationLoggerBundle\PimcoreApplicationLoggerBundle::class => ['all' => true], + \Pimcore\Bundle\WebToPrintBundle\PimcoreWebToPrintBundle::class => ['all' => true], + \Pimcore\Bundle\TinymceBundle\PimcoreTinymceBundle::class => ['all' => true], + \Pimcore\Bundle\StaticRoutesBundle\PimcoreStaticRoutesBundle::class => ['all' => true], + \Pimcore\Bundle\NewsletterBundle\PimcoreNewsletterBundle::class => ['all' => true], + \Pimcore\Bundle\WordExportBundle\PimcoreWordExportBundle::class => ['all' => true], + \Pimcore\Bundle\XliffBundle\PimcoreXliffBundle::class => ['all' => true], + \Pimcore\Bundle\FileExplorerBundle\PimcoreFileExplorerBundle::class => ['all' => true], + \Pimcore\Bundle\SystemInfoBundle\PimcoreSystemInfoBundle::class => ['all' => true], \Pimcore\Bundle\ObjectMergerBundle\ObjectMergerBundle::class => ['all' => true], -// \Pimcore\Bundle\EcommerceFrameworkBundle\PimcoreEcommerceFrameworkBundle::class => ['all' => true], \Pimcore\Bundle\DataHubBundle\PimcoreDataHubBundle::class => ['all' => true], \Pimcore\Bundle\DataHubSimpleRestBundle\PimcoreDataHubSimpleRestBundle::class => ['all' => true], @@ -23,12 +26,10 @@ \Pimcore\Bundle\DataHubFileExportBundle\PimcoreDataHubFileExportBundle::class => ['all' => true], \Pimcore\Bundle\DataHubProductsupBundle\PimcoreDataHubProductsupBundle::class => ['all' => true], \Pimcore\Bundle\DataImporterBundle\PimcoreDataImporterBundle::class => ['all' => true], - + \Pimcore\Bundle\CustomReportsBundle\PimcoreCustomReportsBundle::class => ['all' => true], \Pimcore\Bundle\OpenIdConnectBundle\PimcoreOpenIdConnectBundle::class => ['all' => true], \AdvancedObjectSearchBundle\AdvancedObjectSearchBundle::class => ['all' => true], - \Pimcore\Bundle\DirectEditBundle\PimcoreDirectEditBundle::class => ['all' => true], - \Pimcore\AssetMetadataClassDefinitionsBundle\PimcoreAssetMetadataClassDefinitionsBundle::class => ['all' => true], \FrontendPermissionToolkitBundle\FrontendPermissionToolkitBundle::class => ['all' => true], \Pimcore\Bundle\DirectEditBundle\PimcoreDirectEditBundle::class => ['all' => true], @@ -41,6 +42,8 @@ \Pimcore\Bundle\ObjectMergerBundle\ObjectMergerBundle::class => ['all' => true], \CustomerManagementFrameworkBundle\PimcoreCustomerManagementFrameworkBundle::class => ['all' => true], \OutputDataConfigToolkitBundle\OutputDataConfigToolkitBundle::class => ['all' => true], + \Pimcore\Bundle\WebToPrintBundle\PimcoreWebToPrintBundle::class => ['all' => true], + \Pimcore\Bundle\StaticRoutesBundle\PimcoreStaticRoutesBundle::class => ['all' => true], \Web2PrintToolsBundle\Web2PrintToolsBundle::class => ['all' => true], \Pimcore\Bundle\PerspectiveEditorBundle\PimcorePerspectiveEditorBundle::class => ['all' => true], diff --git a/.github/files/config-advanced-object-search.yaml b/.github/files/config-advanced-object-search.yaml index d018a48..92c0728 100644 --- a/.github/files/config-advanced-object-search.yaml +++ b/.github/files/config-advanced-object-search.yaml @@ -1,6 +1,4 @@ advanced_object_search: index_name_prefix: 'advanced_object_search_' - es_hosts: - - 'elastic' messenger_queue_processing: activated: true diff --git a/.github/files/config-config.yaml b/.github/files/config-config.yaml new file mode 100644 index 0000000..e18329f --- /dev/null +++ b/.github/files/config-config.yaml @@ -0,0 +1,50 @@ +pimcore: + config_location: + image_thumbnails: + write_target: + type: 'settings-store' + document_types: + write_target: + type: 'settings-store' + predefined_asset_metadata: + write_target: + type: 'settings-store' + object_custom_layouts: + write_target: + type: 'settings-store' + custom_views: + write_target: + type: 'settings-store' + perspectives: + write_target: + type: 'settings-store' + predefined_properties: + write_target: + type: 'settings-store' + video_thumbnails: + write_target: + type: 'settings-store' + +pimcore_custom_reports: + config_location: + custom_reports: + write_target: + type: 'settings-store' + +pimcore_web_to_print: + config_location: + web_to_print: + write_target: + type: 'settings-store' + +pimcore_static_routes: + config_location: + staticroutes: + write_target: + type: 'settings-store' + +pimcore_data_hub: + config_location: + data_hub: + write_target: + type: 'settings-store' diff --git a/.github/files/config-datahub.yaml b/.github/files/config-datahub.yaml index 78345bb..eb52a51 100644 --- a/.github/files/config-datahub.yaml +++ b/.github/files/config-datahub.yaml @@ -10,8 +10,6 @@ pimcore_data_hub_simple_rest: index_name_prefix: datahub_restindex_ # Limit of page size and offset when paging only works via page cursor (and not page numbers anymore). Limit 10000 comes from Elasticsearch. max_results_window: 10000 - es_hosts: - - 'elastic' indexing_options: assets: enable_exif: false diff --git a/.github/files/config-system.yaml b/.github/files/config-system.yaml index a55e313..70f211a 100644 --- a/.github/files/config-system.yaml +++ b/.github/files/config-system.yaml @@ -1,3 +1,17 @@ pimcore: general: - valid_languages: 'en,de,fr' \ No newline at end of file + valid_languages: 'en,de,fr' + + chromium: + uri: 'ws://chrome:3000/' + + gotenberg: + base_url: 'http://gotenberg:3000' + +pimcore_elasticsearch_client: + es_clients: + default: + hosts: [ 'elastic:9200' ] + username: 'elastic' + password: 'somethingsecret' + logger_channel: 'pimcore.elasicsearch' \ No newline at end of file diff --git a/.github/files/docker-compose.override.yaml b/.github/files/docker-compose.override.yaml index 82bdc85..4a2a0a1 100644 --- a/.github/files/docker-compose.override.yaml +++ b/.github/files/docker-compose.override.yaml @@ -2,6 +2,8 @@ services: php: user: www-data:0 + environment: + PIMCORE_ES_CLIENT_HOST: elastic:9200 supervisord: user: www-data:0 @@ -30,12 +32,20 @@ services: - xpack.security.authc.anonymous.roles=superuser,kibana_admin,kibana_system,kibana_user - ELASTIC_USERNAME=elastic - ELASTIC_PASSWORD=somethingsecret + ports: + - "9200:9200" deploy: resources: limits: cpus: '1' memory: '2G' - + + chrome: + image: browserless/chrome + + gotenberg: + image: gotenberg/gotenberg:7 + networks: default: name: k6-test-network diff --git a/.github/files/supervisord.conf b/.github/files/supervisord.conf index 4eb0110..a2db862 100644 --- a/.github/files/supervisord.conf +++ b/.github/files/supervisord.conf @@ -1,7 +1,7 @@ # Important Notice: this configuration is not optimized for production use! [program:messenger-consume] -command=php /var/www/html/bin/console messenger:consume pimcore_core pimcore_index_queues pimcore_data_import pimcore_datahub_fileexport portal-engine-async pimcore_maintenance --memory-limit=250M --time-limit=3600 -vv +command=php /var/www/html/bin/console messenger:consume pimcore_core pimcore_scheduled_tasks pimcore_index_queues pimcore_data_import pimcore_datahub_fileexport portal-engine-async pimcore_maintenance pimcore_image_optimize pimcore_asset_update pimcore_search_backend_message --memory-limit=250M --time-limit=3600 -vv numprocs=2 startsecs=0 autostart=true @@ -12,7 +12,7 @@ stdout_logfile_maxbytes=0 redirect_stderr=true [program:maintenance] -command=bash -c 'sleep 3600 && exec php /var/www/html/bin/console pimcore:maintenance --async' +command=bash -c 'sleep 360 && exec php /var/www/html/bin/console pimcore:maintenance --async' autostart=true autorestart=true stdout_logfile=/dev/fd/1 diff --git a/.github/scripts/00-localsetup.sh b/.github/scripts/00-localsetup.sh index 38e1b5f..b76c467 100755 --- a/.github/scripts/00-localsetup.sh +++ b/.github/scripts/00-localsetup.sh @@ -15,7 +15,6 @@ mkdir platform-version-working-dir || true cd platform-version-working-dir git clone git@github.com:pimcore/saas-k6.git cd saas-k6 -git switch pimcore-10 cd ../ source ../platform-version/.github/scripts/01-setup-environment.sh $1 diff --git a/.github/scripts/01-setup-environment.sh b/.github/scripts/01-setup-environment.sh index 0a0fb9b..5e2e9bd 100755 --- a/.github/scripts/01-setup-environment.sh +++ b/.github/scripts/01-setup-environment.sh @@ -14,8 +14,8 @@ sudo rm -rf test-project/ docker run \ -u `id -u`:`id -g` --rm \ -v `pwd`:/var/www/html \ - pimcore/pimcore:php8.1-latest \ - composer create-project pimcore/skeleton test-project + pimcore/pimcore:php8.2-latest \ + composer create-project pimcore/skeleton:~11.0.0 test-project cd test-project/ @@ -47,8 +47,13 @@ docker compose exec -T -- php composer config repositories.dev path "./platform- docker compose exec -T -- php composer config --global --auth http-basic.enterprise.repo.pimcore.com token $1 docker compose exec -T -- php composer config repositories.pimcore_enterprise composer https://enterprise.repo.pimcore.com/ -docker compose exec -T -- php composer require pimcore/platform-version:@dev +docker compose exec -T -- php composer config minimum-stability dev +docker compose exec -T -- php composer config prefer-stable true + +docker compose exec -T -- php composer require pimcore/platform-version:@dev pimcore/pimcore pimcore/admin-ui-classic-bundle -W docker compose exec -T -- php composer require -W \ + gotenberg/gotenberg-php:^1.1 \ + pimcore/admin-ui-classic-bundle \ pimcore/asset-metadata-class-definitions \ pimcore/data-hub-ci-hub \ pimcore/data-hub-file-export \ @@ -65,11 +70,19 @@ docker compose exec -T -- php composer require -W \ pimcore/data-hub \ pimcore/customer-management-framework-bundle \ pimcore/web2print-tools-bundle \ + pimcore/web-to-print-bundle \ pimcore/perspective-editor \ pimcore/output-data-config-toolkit-bundle \ pimcore/object-merger \ pimcore/frontend-permission-toolkit-bundle \ - pimcore/advanced-object-search + pimcore/advanced-object-search \ + pimcore/system-info-bundle \ + pimcore/file-explorer-bundle \ + pimcore/personalization-bundle \ + pimcore/google-marketing-bundle \ + pimcore/web-to-print-bundle \ + pimcore/ecommerce-framework-bundle \ + pimcore/newsletter-bundle docker compose exec -T -- php composer update diff --git a/.github/scripts/02-install-pimcore.sh b/.github/scripts/02-install-pimcore.sh index 98a7dee..e96940e 100755 --- a/.github/scripts/02-install-pimcore.sh +++ b/.github/scripts/02-install-pimcore.sh @@ -14,16 +14,27 @@ docker compose exec -T \ php vendor/bin/pimcore-install -n sudo chown -R `id -g` ./config # necessary to allow copying of config files during install of Pimcore +sudo chmod -R 777 ./config # necessary to allow copying of config files during install of Pimcore cp ../../platform-version/.github/files/bundles.php ./config cp ../../platform-version/.github/files/config-system.yaml ./config/local docker compose exec -T php bin/console cache:clear -# todo remove that -docker compose exec -T php bin/console pimcore:bundle:enable -p15 ElementsProcessManagerBundle -docker compose exec -T php bin/console pimcore:bundle:install ElementsProcessManagerBundle - +docker compose exec -T php bin/console pimcore:bundle:install PimcorePersonalizationBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreGlossaryBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreSeoBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreSimpleBackendSearchBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreCustomReportsBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreGoogleMarketingBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreApplicationLoggerBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreWebToPrintBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreTinymceBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreStaticRoutesBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreNewsletterBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreWordExportBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreXliffBundle +docker compose exec -T php bin/console pimcore:bundle:install PimcoreFileExplorerBundle docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataHubBundle docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataImporterBundle @@ -53,6 +64,8 @@ docker compose exec -T php bin/console pimcore:bundle:install Web2PrintToolsBund docker compose exec -T php bin/console pimcore:bundle:install OutputDataConfigToolkitBundle docker compose exec -T php bin/console pimcore:bundle:install PimcorePerspectiveEditorBundle +cp ../../platform-version/.github/files/config-config.yaml ./config/local + docker compose exec -T php bin/console cache:clear sudo chown -R www-data . \ No newline at end of file diff --git a/.github/scripts/04-shutdown.sh b/.github/scripts/04-shutdown.sh index 3cf4150..ccee955 100755 --- a/.github/scripts/04-shutdown.sh +++ b/.github/scripts/04-shutdown.sh @@ -1,5 +1,5 @@ #!/bin/bash set -ex -docker-compose down -v --remove-orphans +docker compose down -v --remove-orphans docker network rm k6-test-network \ No newline at end of file diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index a1aa9cf..a23032c 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -18,7 +18,7 @@ jobs: uses: "actions/checkout@v3" with: repository: "pimcore/saas-k6" - ref: "pimcore-10" + ref: "main" path: "./platform-version-working-dir/saas-k6" token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} diff --git a/composer.json b/composer.json index 1aa42b3..94fe583 100644 --- a/composer.json +++ b/composer.json @@ -4,27 +4,35 @@ "description": "Verified Pimcore Version", "license": "PCL", "conflict": { - "pimcore/asset-metadata-class-definitions": "<1.2 || > 1.2.99", - "pimcore/data-hub-ci-hub": "<1.1 || > 1.1.99", - "pimcore/data-hub-file-export": "<1.5 || > 1.5.99", - "pimcore/data-hub-productsup": "<1.3 || > 1.3.99", - "pimcore/data-hub-simple-rest": "<1.7 || > 1.7.99", - "pimcore/direct-edit": "<1.2 || > 1.2.99", - "pimcore/headless-documents": "<1.3 || > 1.3.99", - "pimcore/openid-connect": "<1.0 || > 1.0.99", - "pimcore/portal-engine": "<2.4 || > 2.4.99", - "pimcore/statistics-explorer": "<1.4 || > 1.4.99", - "pimcore/translations-provider-interfaces": "<2.6 || > 2.6.99", - "pimcore/workflow-designer": "<1.0 || > 1.0.99", - "pimcore/data-importer": "<1.7 || > 1.7.99", - "pimcore/data-hub": "<1.5 || > 1.5.99", - "pimcore/customer-management-framework-bundle": "<3.3 || > 3.3.99", - "pimcore/web2print-tools-bundle": "<4.0 || > 4.0.99", - "pimcore/perspective-editor": "<1.5 || > 1.5.99", - "pimcore/output-data-config-toolkit-bundle": "<4.1 || > 4.1.99", - "pimcore/object-merger": "<3.0 || > 3.0.99", - "pimcore/frontend-permission-toolkit-bundle": "<1.5 || > 1.5.99", - "pimcore/advanced-object-search": "<4.3 || > 4.3.99", - "pimcore/pimcore": "<10.5 || >10.5.99" + "pimcore/asset-metadata-class-definitions": "<2.0 || > 2.0.99", + "pimcore/data-hub-ci-hub": "<1.2 || > 1.2.99", + "pimcore/data-hub-file-export": "<2.0 || > 2.0.99", + "pimcore/data-hub-productsup": "<2.0 || > 2.0.99", + "pimcore/data-hub-simple-rest": "<2.0 || > 2.0.99", + "pimcore/direct-edit": "<2.0 || > 2.0.99", + "pimcore/headless-documents": "<2.0 || > 2.0.99", + "pimcore/openid-connect": "<1.1 || > 1.1.99", + "pimcore/portal-engine": "<3.0 || > 3.0.99", + "pimcore/statistics-explorer": "<2.0 || > 2.0.99", + "pimcore/translations-provider-interfaces": "<3.0 || > 3.0.99", + "pimcore/workflow-designer": "<1.1 || > 1.1.99", + "pimcore/data-importer": "<1.8 || > 1.8.99", + "pimcore/data-hub": "<1.6 || > 1.6.99", + "pimcore/customer-management-framework-bundle": "<4.0 || > 4.0.99", + "pimcore/web2print-tools-bundle": "<5.0 || > 5.0.99", + "pimcore/perspective-editor": "<1.6 || > 1.6.99", + "pimcore/output-data-config-toolkit-bundle": "<5.0 || > 5.0.99", + "pimcore/object-merger": "<4.0 || > 4.0.99", + "pimcore/frontend-permission-toolkit-bundle": "<2.0 || > 2.0.99", + "pimcore/advanced-object-search": "<5.0 || > 5.0.99", + "pimcore/admin-ui-classic-bundle": "<1.0 || > 1.0.99", + "pimcore/system-info-bundle": "<1.0 || > 1.0.99", + "pimcore/file-explorer-bundle": "<1.0 || > 1.0.99", + "pimcore/personalization-bundle": "<1.0 || > 1.0.99", + "pimcore/google-marketing-bundle": "<1.0 || > 1.0.99", + "pimcore/web-to-print-bundle": "<1.0 || > 1.0.99", + "pimcore/ecommerce-framework-bundle": "<1.0 || > 1.0.99", + "pimcore/newsletter-bundle": "<1.0 || > 1.0.99", + "pimcore/pimcore": "<11.0 || > 11.0.99" } }