Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Pimcore 11 #10

Merged
merged 17 commits into from
May 19, 2023
Merged
15 changes: 1 addition & 14 deletions .github/files/.env.local
Original file line number Diff line number Diff line change
@@ -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
APP_DEBUG=false
33 changes: 19 additions & 14 deletions .github/files/bundles.php
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
<?php

return [
// \Pimcore\Bundle\GlossaryBundle\PimcoreGlossaryBundl::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\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],
\Pimcore\Bundle\DataHubCiHubBundle\PimcoreDataHubCiHubBundle::class => ['all' => true],
\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],

Expand All @@ -41,6 +44,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],
Expand Down
2 changes: 0 additions & 2 deletions .github/files/config-advanced-object-search.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
advanced_object_search:
index_name_prefix: 'advanced_object_search_'
es_hosts:
- 'elastic'
messenger_queue_processing:
activated: true
50 changes: 50 additions & 0 deletions .github/files/config-config.yaml
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 0 additions & 2 deletions .github/files/config-datahub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 15 additions & 1 deletion .github/files/config-system.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
pimcore:
general:
valid_languages: 'en,de,fr'
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'
12 changes: 11 additions & 1 deletion .github/files/docker-compose.override.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ services:

php:
user: www-data:0
environment:
PIMCORE_ES_CLIENT_HOST: elastic:9200

supervisord:
user: www-data:0
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/files/supervisord.conf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/scripts/00-localsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 17 additions & 4 deletions .github/scripts/01-setup-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 --prefer-dist --stability=dev pimcore/skeleton:11.x test-project
fashxp marked this conversation as resolved.
Show resolved Hide resolved
fashxp marked this conversation as resolved.
Show resolved Hide resolved

cd test-project/

Expand Down Expand Up @@ -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 \
Expand All @@ -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

Expand Down
21 changes: 17 additions & 4 deletions .github/scripts/02-install-pimcore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 .
2 changes: 1 addition & 1 deletion .github/scripts/04-shutdown.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
52 changes: 30 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.x-dev",
"pimcore/data-hub-ci-hub": "!=1.x-dev",
"pimcore/data-hub-file-export": "!=2.x-dev",
"pimcore/data-hub-productsup": "!=2.x-dev",
"pimcore/data-hub-simple-rest": "!=2.x-dev",
"pimcore/direct-edit": "!=2.x-dev",
"pimcore/headless-documents": "!=2.x-dev",
"pimcore/openid-connect": "!=1.x-dev",
"pimcore/portal-engine": "!=3.x-dev",
"pimcore/statistics-explorer": "!=2.x-dev",
"pimcore/translations-provider-interfaces": "!=3.x-dev",
"pimcore/workflow-designer": "!=1.x-dev",
"pimcore/data-importer": "!=1.x-dev",
"pimcore/data-hub": "!=1.x-dev",
"pimcore/customer-management-framework-bundle": "!=4.x-dev",
"pimcore/web2print-tools-bundle": "!=5.x-dev",
"pimcore/perspective-editor": "!=1.x-dev",
"pimcore/output-data-config-toolkit-bundle": "!=5.x-dev",
"pimcore/object-merger": "!=4.x-dev",
"pimcore/frontend-permission-toolkit-bundle": "!=2.x-dev",
"pimcore/advanced-object-search": "!=5.x-dev",
"pimcore/admin-ui-classic-bundle": "!=1.x-dev",
"pimcore/system-info-bundle": "!=1.x-dev",
"pimcore/file-explorer-bundle": "!=1.x-dev",
"pimcore/personalization-bundle": "!=1.x-dev",
"pimcore/google-marketing-bundle": "!=1.x-dev",
"pimcore/web-to-print-bundle": "!=1.x-dev",
"pimcore/ecommerce-framework-bundle": "!=1.x-dev",
"pimcore/newsletter-bundle": "!=1.x-dev",
"pimcore/pimcore": "!=11.x-dev"
}
}