From 3ae1d7b9f4f0be315a82d4e74606ac5d57d19679 Mon Sep 17 00:00:00 2001 From: Christian Fasching <fashxp@users.noreply.github.com> Date: Mon, 15 May 2023 10:48:08 +0200 Subject: [PATCH 01/15] Update composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index b73aa4959..8c6a71d6d 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ } }, "prefer-stable": true, - "minimum-stability": "dev", "require": { "pimcore/pimcore": "^11.0", "pimcore/admin-ui-classic-bundle": "^1.0", From 68c89742e407ea6776887e6143cf094a930d69f3 Mon Sep 17 00:00:00 2001 From: Christian Fasching <fashxp@users.noreply.github.com> Date: Mon, 15 May 2023 10:49:14 +0200 Subject: [PATCH 02/15] Update composer.json --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 8c6a71d6d..d5fed29f6 100644 --- a/composer.json +++ b/composer.json @@ -17,10 +17,6 @@ "symfony/runtime": "^6.2", "symfony/dotenv": "^6.2" }, - "conflict": { - "pimcore/pimcore": "v11.0.0-ALPHA1 || v11.0.0-ALPHA2 || v11.0.0-ALPHA3 || v11.0.0-ALPHA4 || v11.0.0-ALPHA5 || v11.0.0-ALPHA6 || v11.0.0-ALPHA7 || v11.0.0-ALPHA8 || v11.0.0-BETA1 || v11.0.0-RC1", - "pimcore/admin-ui-classic-bundle": "v1.0.0-BETA1" - }, "require-dev": { "codeception/codeception": "^5.0.3", "codeception/module-symfony": "^3.1.0" From 97a3892eb8fcf084e4a382b4ecb911d8bd349a30 Mon Sep 17 00:00:00 2001 From: Christian Fasching <christian.fasching@pimcore.com> Date: Mon, 15 May 2023 10:55:08 +0200 Subject: [PATCH 03/15] Revert "Update composer.json" This reverts commit 68c89742e407ea6776887e6143cf094a930d69f3. --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index d5fed29f6..8c6a71d6d 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,10 @@ "symfony/runtime": "^6.2", "symfony/dotenv": "^6.2" }, + "conflict": { + "pimcore/pimcore": "v11.0.0-ALPHA1 || v11.0.0-ALPHA2 || v11.0.0-ALPHA3 || v11.0.0-ALPHA4 || v11.0.0-ALPHA5 || v11.0.0-ALPHA6 || v11.0.0-ALPHA7 || v11.0.0-ALPHA8 || v11.0.0-BETA1 || v11.0.0-RC1", + "pimcore/admin-ui-classic-bundle": "v1.0.0-BETA1" + }, "require-dev": { "codeception/codeception": "^5.0.3", "codeception/module-symfony": "^3.1.0" From ecdc69d8742695ae6affd320c6cd2a53249e1f46 Mon Sep 17 00:00:00 2001 From: Christian Fasching <christian.fasching@pimcore.com> Date: Mon, 15 May 2023 10:55:14 +0200 Subject: [PATCH 04/15] Revert "Update composer.json" This reverts commit 3ae1d7b9f4f0be315a82d4e74606ac5d57d19679. --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 8c6a71d6d..b73aa4959 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ } }, "prefer-stable": true, + "minimum-stability": "dev", "require": { "pimcore/pimcore": "^11.0", "pimcore/admin-ui-classic-bundle": "^1.0", From c5de1af6e85acaf8d449cd50ba2bb6881685fe2c Mon Sep 17 00:00:00 2001 From: Bernhard Rusch <brusch@users.noreply.github.com> Date: Tue, 16 May 2023 12:54:44 +0200 Subject: [PATCH 05/15] docker-compose.yaml: use latest PHP 8.2 images (#151) --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 58d63cc18..155c4d324 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -36,7 +36,7 @@ services: php: #user: '1000:1000' # set to your uid:gid - image: pimcore/pimcore:php8.2-debug-v2-dev + image: pimcore/pimcore:php8.2-debug-latest environment: COMPOSER_HOME: /var/www/html PHP_IDE_CONFIG: serverName=localhost @@ -55,7 +55,7 @@ services: supervisord: #user: '1000:1000' # set to your uid:gid - image: pimcore/pimcore:php8.2-supervisord-v2-dev + image: pimcore/pimcore:php8.2-supervisord-latest depends_on: db: condition: service_healthy From 147457b75763e6777d353f1765ebaef812c3cb4f Mon Sep 17 00:00:00 2001 From: Christian Fasching <fashxp@users.noreply.github.com> Date: Tue, 16 May 2023 18:58:43 +0200 Subject: [PATCH 06/15] Pimcore 11 Release Preparations (#152) * Pimcore 11 Release Preparations * added composer.enterprise.json --- composer.enterprise.json | 60 ++++++++++++++++++++++++++++++++++++++++ composer.json | 5 ---- 2 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 composer.enterprise.json diff --git a/composer.enterprise.json b/composer.enterprise.json new file mode 100644 index 000000000..4a291ed28 --- /dev/null +++ b/composer.enterprise.json @@ -0,0 +1,60 @@ +{ + "name": "pimcore/skeleton", + "type": "project", + "license": "GPL-3.0-or-later", + "config": { + "optimize-autoloader": true, + "sort-packages": true, + "process-timeout": 0, + "allow-plugins": { + "symfony/runtime": true + } + }, + "prefer-stable": true, + "require": { + "pimcore/pimcore": "^11.0", + "pimcore/admin-ui-classic-bundle": "^1.0", + "pimcore/platform-version": "^2023.1", + "symfony/runtime": "^6.2", + "symfony/dotenv": "^6.2" + }, + "require-dev": { + "codeception/codeception": "^5.0.3", + "codeception/module-symfony": "^3.1.0" + }, + "suggest": { + "pimcore/data-hub": "Universal data interface for GraphQL, CSV and other formats" + }, + "autoload": { + "psr-4": { + "App\\": "src/", + "Pimcore\\Model\\DataObject\\": "var/classes/DataObject" + } + }, + "autoload-dev": { + "psr-4": { + "App\\Tests\\": "tests/" + } + }, + "scripts": { + "post-create-project-cmd": "Pimcore\\Composer::postCreateProject", + "post-install-cmd": [ + "Pimcore\\Composer::postInstall", + "@pimcore-scripts" + ], + "post-update-cmd": [ + "Pimcore\\Composer::postUpdate", + "@pimcore-scripts" + ], + "pimcore-scripts": [ + "Pimcore\\Composer::clearCache", + "Pimcore\\Composer::installAssets" + ] + }, + "repositories": { + "enterprise": { + "type": "composer", + "url": "https://enterprise.repo.pimcore.com/" + } + } +} diff --git a/composer.json b/composer.json index b73aa4959..d5fed29f6 100644 --- a/composer.json +++ b/composer.json @@ -11,17 +11,12 @@ } }, "prefer-stable": true, - "minimum-stability": "dev", "require": { "pimcore/pimcore": "^11.0", "pimcore/admin-ui-classic-bundle": "^1.0", "symfony/runtime": "^6.2", "symfony/dotenv": "^6.2" }, - "conflict": { - "pimcore/pimcore": "v11.0.0-ALPHA1 || v11.0.0-ALPHA2 || v11.0.0-ALPHA3 || v11.0.0-ALPHA4 || v11.0.0-ALPHA5 || v11.0.0-ALPHA6 || v11.0.0-ALPHA7 || v11.0.0-ALPHA8 || v11.0.0-BETA1 || v11.0.0-RC1", - "pimcore/admin-ui-classic-bundle": "v1.0.0-BETA1" - }, "require-dev": { "codeception/codeception": "^5.0.3", "codeception/module-symfony": "^3.1.0" From dca74adbbb700183269783d0d72afafa79ac86fc Mon Sep 17 00:00:00 2001 From: Jacob Dreesen <j.dreesen@neusta.de> Date: Tue, 20 Jun 2023 11:33:43 +0200 Subject: [PATCH 07/15] Consume `pimcore_image_optimize` queue --- .docker/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/supervisord.conf b/.docker/supervisord.conf index 5dcb46f25..7dd03509c 100644 --- a/.docker/supervisord.conf +++ b/.docker/supervisord.conf @@ -2,7 +2,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_maintenance --memory-limit=250M --time-limit=3600 +command=php /var/www/html/bin/console messenger:consume pimcore_core pimcore_maintenance pimcore_image_optimize --memory-limit=250M --time-limit=3600 numprocs=1 startsecs=0 autostart=true From 4ac81476c370d38462ce42a3f5b1a31329064170 Mon Sep 17 00:00:00 2001 From: Jacob Dreesen <j.dreesen@neusta.de> Date: Wed, 12 Jul 2023 11:11:48 +0200 Subject: [PATCH 08/15] Support webp in nginx --- .docker/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/nginx.conf b/.docker/nginx.conf index c41325bd1..7e382a7f2 100644 --- a/.docker/nginx.conf +++ b/.docker/nginx.conf @@ -105,7 +105,7 @@ server { # Assets # Still use a whitelist approach to prevent each and every missing asset to go through the PHP Engine. - location ~* ^(?!/admin)(.+?)\.((?:css|js)(?:\.map)?|jpe?g|gif|png|svgz?|eps|exe|gz|zip|mp\d|m4a|ogg|ogv|webm|pdf|docx?|xlsx?|pptx?)$ { + location ~* ^(?!/admin)(.+?)\.((?:css|js)(?:\.map)?|jpe?g|gif|png|svgz?|eps|exe|gz|zip|mp\d|m4a|ogg|ogv|webp|webm|pdf|docx?|xlsx?|pptx?)$ { try_files /var/assets$uri $uri =404; expires 2w; access_log off; From 2981b8fa0ca9862a17217a0f3f038538c69c4793 Mon Sep 17 00:00:00 2001 From: Linus Metzler <linus.metzler@cec.valantic.com> Date: Wed, 19 Jul 2023 10:55:58 +0200 Subject: [PATCH 09/15] Adapt call to pimcore:maintenance to Pimcore 11 In Pimcore 11 (which this repo requires), the `--async` flag in the `pimcore:maintenance` command was [removed](https://github.com/pimcore/pimcore/pull/13042). --- .docker/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/supervisord.conf b/.docker/supervisord.conf index 748a09025..e0956b3de 100644 --- a/.docker/supervisord.conf +++ b/.docker/supervisord.conf @@ -13,7 +13,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 3600 && exec php /var/www/html/bin/console pimcore:maintenance' autostart=true autorestart=true stdout_logfile=/dev/fd/1 From fef1279b7e9300ffbb640c805688bf766097f9eb Mon Sep 17 00:00:00 2001 From: Dominik <dominik.geyer@weblizards.de> Date: Thu, 13 Jul 2023 12:13:56 +0200 Subject: [PATCH 10/15] Update .gitignore: Remove obsolete ignore for debug-mode.php The `var/config/debug-mode.php` file has been removed in Pimcore 10 by pimcore/pimcore@d2c40d5d316b0068d63753e49b7834e95e63c491 --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 159ccab4c..8e92a919a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ !/var/config /var/config/system.yml -/var/config/debug-mode.php /var/config/maintenance.php # project specific recommendations From 31a0daef0c3d996b677d8bd51f77fe3ef5030f2d Mon Sep 17 00:00:00 2001 From: Divesh Pahuja <divesh.pahuja@gmail.com> Date: Thu, 20 Jul 2023 18:26:33 +0200 Subject: [PATCH 11/15] Bump pimcore/pimcore requirement --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d5fed29f6..23e88f3e2 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "prefer-stable": true, "require": { - "pimcore/pimcore": "^11.0", + "pimcore/pimcore": "^11.0.4", "pimcore/admin-ui-classic-bundle": "^1.0", "symfony/runtime": "^6.2", "symfony/dotenv": "^6.2" From 3b9b2fc1281fa4065881bc0ffe6d58301ce89625 Mon Sep 17 00:00:00 2001 From: Divesh Pahuja <divesh.pahuja@gmail.com> Date: Tue, 1 Aug 2023 14:25:27 +0200 Subject: [PATCH 12/15] Update config.yaml --- config/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index cb22ac127..b71a407ee 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -110,9 +110,8 @@ framework: # pools: # pimcore.cache.pool: # public: true -# tags: true # default_lifetime: 31536000 # 1 year -# adapter: pimcore.cache.adapter.redis_tag_aware +# adapter: cache.adapter.redis_tag_aware # provider: 'redis://localhost' # Redis DNS, see: https://symfony.com/doc/current/components/cache/adapters/redis_adapter.html#configure-the-connection #### USE SESSION HANDLER CONFIGURED IN php.ini From 5377528a16bc3050a98f7d607b28a3dd2324fcb4 Mon Sep 17 00:00:00 2001 From: Divesh Pahuja <divesh.pahuja@pimcore.com> Date: Thu, 3 Aug 2023 11:59:05 +0200 Subject: [PATCH 13/15] kick duplicate nginx image/avif config - resolves #161 --- .docker/nginx.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/.docker/nginx.conf b/.docker/nginx.conf index 7e382a7f2..70c048392 100644 --- a/.docker/nginx.conf +++ b/.docker/nginx.conf @@ -1,9 +1,6 @@ # mime types are already covered in nginx.conf #include mime.types; -types { - image/avif avif; -} upstream php-pimcore10 { server php:9000; From f8138aedeaa172fc3a76b4ca947c52537aaf8ec7 Mon Sep 17 00:00:00 2001 From: Iaroslav Sheptykin <i.sheptykin@neusta.de> Date: Thu, 3 Aug 2023 12:32:56 +0200 Subject: [PATCH 14/15] Correct filesystem permissions in test setup (#162) * Reproduce the issue in test * Fix README instuctions for test setup --- .github/workflows/pimcore-skeleton.yml | 4 ++++ README.md | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pimcore-skeleton.yml b/.github/workflows/pimcore-skeleton.yml index cbc679ff4..42347916f 100644 --- a/.github/workflows/pimcore-skeleton.yml +++ b/.github/workflows/pimcore-skeleton.yml @@ -68,6 +68,9 @@ jobs: cd sample-project/ + # Set up docker-compose.yaml to use current user's uid:gid, just like README.md suggests. + sed -i "s|#user: '1000:1000'|user: '$(id -u):$(id -g)'|g" docker-compose.yaml + # Start containers docker compose pull --quiet docker compose up -d @@ -87,5 +90,6 @@ jobs: cd sample-project/ # Set up and execute codeception tests, just like README.md suggests. + docker compose run --user=root --rm test-php chown -R $(id -u):$(id -g) var/ public/var/ docker compose run --rm -T test-php vendor/bin/pimcore-install -n docker compose run --rm -T test-php vendor/bin/codecept run -vv diff --git a/README.md b/README.md index f5bc729e4..ce9d70a1d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ cd ./my-project You can also use Docker to set up a new Pimcore Installation. You don't need to have a PHP environment with composer installed. -### Prerequisits +### Prerequisites * Your user must be allowed to run docker commands (directly or via sudo). * You must have docker compose installed. @@ -33,8 +33,7 @@ You don't need to have a PHP environment with composer installed. `cd my-project/` 3. Part of the new project is a docker compose file - * Run `` echo `id -u`:`id -g` `` to retrieve your local user and group id - * Open the `docker-compose.yaml` file in an editor, uncomment all the `user: '1000:1000'` lines and update the ids if necessary + * Run `sed -i "s|#user: '1000:1000'|user: '$(id -u):$(id -g)'|g" docker-compose.yaml` to set the correct user id and group id. * Start the needed services with `docker compose up -d` 4. Install pimcore and initialize the DB @@ -44,6 +43,7 @@ You don't need to have a PHP environment with composer installed. * If you select to install the SimpleBackendSearchBundle please make sure to add the `pimcore_search_backend_message` to your `.docker/supervisord.conf` file. 5. Run codeception tests: + * `docker compose run --user=root --rm test-php chown -R $(id -u):$(id -g) var/ public/var/` * `docker compose run --rm test-php vendor/bin/pimcore-install -n` * `docker compose run --rm test-php vendor/bin/codecept run -vv` From 1dabc30d3478658bdb332b6989062102875f0563 Mon Sep 17 00:00:00 2001 From: Divesh Pahuja <divesh.pahuja@gmail.com> Date: Wed, 30 Aug 2023 15:46:58 +0200 Subject: [PATCH 15/15] Fix assets are not accessible on webdav links (#170) * Fix assets are not accessible on webdav links - related to pimcore/pimcore#15856 * review changes --- .docker/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/nginx.conf b/.docker/nginx.conf index 3a8b57e4f..ce25cd9cf 100644 --- a/.docker/nginx.conf +++ b/.docker/nginx.conf @@ -102,7 +102,7 @@ server { # Assets # Still use a whitelist approach to prevent each and every missing asset to go through the PHP Engine. - location ~* ^(?!/admin)(.+?)\.((?:css|js)(?:\.map)?|jpe?g|gif|png|svgz?|eps|exe|gz|zip|mp\d|m4a|ogg|ogv|webp|webm|pdf|docx?|xlsx?|pptx?)$ { + location ~* ^(?!/admin|/asset/webdav)(.+?)\.((?:css|js)(?:\.map)?|jpe?g|gif|png|svgz?|eps|exe|gz|zip|mp\d|m4a|ogg|ogv|webp|webm|pdf|docx?|xlsx?|pptx?)$ { try_files /var/assets$uri $uri =404; expires 2w; access_log off;