Skip to content

Commit

Permalink
feat: Pimcore 11 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
aarongerig committed May 8, 2024
1 parent a7f0b59 commit 7002a30
Show file tree
Hide file tree
Showing 15 changed files with 378 additions and 62 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ TRUSTED_HOSTS="^.*(\.dev\.local|\.projects\.instride\.dev)$"
MAILER_DSN_MAIN="smtp://mailpit:1025"
MAILER_DSN_NEWSLETTER="smtp://mailpit:1025"

# Pimcore Executables
PIMCORE_EXECUTABLE_PHP="/usr/local/bin/php"

# Pimcore Monitor Bundle
PIMCORE_MONITORING_API_KEY=""
PIMCORE_MONITORING_ENDPOINT=""
Expand Down
4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
- 'redis-data:/data'

db:
image: 'mariadb:10.7'
image: 'mariadb:10.11'
working_dir: '/application'
command:
- 'mysqld'
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
- 'redis'

php:
image: 'pimcore/pimcore:php8.2-debug-latest'
image: 'pimcore/pimcore:PHP8.2-fpm-debug'
volumes:
- '~/.composer:/root/composer'
- '.:/var/www/html:cached'
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
},
"require": {
"php": ">=8.2",
"dachcom-digital/emailizr": "^3.0",
"dachcom-digital/seo": "^3.0",
"dachcom-digital/toolbox": "^5.0",
"instride/pimcore-monitor": "^3.0",
Expand Down
Loading

0 comments on commit 7002a30

Please sign in to comment.