From 1e24a41c4be32026c8486e07582186f7af32976e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Wed, 1 Apr 2020 14:27:01 +0200 Subject: [PATCH 1/4] Update ddev to 1.13.1, add post import-db hook and disable TYPO3 cache in ddev --- .ddev/config.yaml | 2 ++ .../typo3conf/AdditionalConfiguration.ddev.php | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 792cdd72..f458e04b 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -20,6 +20,8 @@ hooks: - exec: npm --prefix private/typo3conf/ext/t3olayout/Build run-script build - exec: vendor/bin/typo3cms install:generatepackagestates - exec: vendor/bin/typo3cms install:extensionsetupifpossible + post-import-db: + - exec: vendor/bin/typo3cms database:updateschema webimage_extra_packages: [php7.2-ldap, build-essential] use_dns_when_possible: true timezone: Europe/Berlin diff --git a/private/typo3conf/AdditionalConfiguration.ddev.php b/private/typo3conf/AdditionalConfiguration.ddev.php index a0c77469..33580304 100644 --- a/private/typo3conf/AdditionalConfiguration.ddev.php +++ b/private/typo3conf/AdditionalConfiguration.ddev.php @@ -20,4 +20,18 @@ $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['host'] = 'db'; $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['port'] = '3306'; $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] = '$P$CZqeoYBTHC0kXKny4tpTvBSzzV5wVY0'; /* joh316 */ -$GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['ter'] = serialize(['repositoryDir' => '/var/www/html/html/fileadmin/ter/']); +$GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['ter']['repositoryDir'] = '/var/www/html/private/fileadmin/ter/'; + +// Disable caches +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_core']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_hash']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_pages']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_pagesection']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_phpcode']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_runtime']['backend'] = \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_rootline']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_imagesizes']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['l10n']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_object']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_reflection']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; \ No newline at end of file -- GitLab From b5386e5586e2f4c9fede084c3cda90f284139c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Wed, 1 Apr 2020 14:35:16 +0200 Subject: [PATCH 2/4] Update ddev to 1.13.1 --- .ddev/.gitignore | 2 -- .ddev/config.yaml | 29 ++++++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.ddev/.gitignore b/.ddev/.gitignore index e47970d8..9989216d 100644 --- a/.ddev/.gitignore +++ b/.ddev/.gitignore @@ -13,11 +13,9 @@ /db_snapshots /sequelpro.spf /import-db -/.bgsync* /config.*.y*ml /.webimageBuild /.dbimageBuild -/.bgsyncimageBuild /.sshimageBuild /.webimageExtra /.dbimageExtra diff --git a/.ddev/config.yaml b/.ddev/config.yaml index f458e04b..30b4a40c 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.12.1 +APIVersion: v1.13.1 name: ter type: typo3 docroot: public @@ -13,6 +13,8 @@ mariadb_version: "10.2" nfs_mount_enabled: false provider: default hooks: + post-import-db: + - exec: vendor/bin/typo3cms database:updateschema post-start: - exec: cp private/typo3conf/AdditionalConfiguration.ddev.php private/typo3conf/AdditionalConfiguration.php - exec: composer install @@ -20,18 +22,15 @@ hooks: - exec: npm --prefix private/typo3conf/ext/t3olayout/Build run-script build - exec: vendor/bin/typo3cms install:generatepackagestates - exec: vendor/bin/typo3cms install:extensionsetupifpossible - post-import-db: - - exec: vendor/bin/typo3cms database:updateschema -webimage_extra_packages: [php7.2-ldap, build-essential] +webimage_extra_packages: [php7.2-ldap] use_dns_when_possible: true timezone: Europe/Berlin -# This config.yaml was created with ddev version v1.12.1 -# webimage: drud/ddev-webserver:v1.12.1 -# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0 -# dbaimage: drud/phpmyadmin:v1.12.0 -# bgsyncimage: drud/ddev-bgsync:v1.12.0 +# This config.yaml was created with ddev version v1.13.1 +# webimage: drud/ddev-webserver:v1.13.1 +# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.13.0 +# dbaimage: phpmyadmin/phpmyadmin:5 # However we do not recommend explicitly wiring these images into the # config.yaml as they may break future versions of ddev. # You can update this config.yaml using 'ddev config'. @@ -45,7 +44,7 @@ timezone: Europe/Berlin # docroot: # Relative path to the directory containing index.php. -# php_version: "7.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" +# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" # You can explicitly specify the webimage, dbimage, dbaimage lines but this # is not recommended, as the images are often closely tied to ddev's' behavior, @@ -54,7 +53,6 @@ timezone: Europe/Berlin # webimage: # nginx/php docker image. # dbimage: # mariadb docker image. # dbaimage: -# bgsyncimage: # mariadb_version and mysql_version # ddev can use many versions of mariadb and mysql @@ -110,10 +108,6 @@ timezone: Europe/Berlin # Great performance improvement but requires host configuration first. # See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container -# webcache_enabled: false (deprecated) -# Was only for macOS, but now deprecated. -# See https://ddev.readthedocs.io/en/stable/users/performance/#webcache - # host_https_port: "59002" # The host port binding for https can be explicitly specified. It is # dynamic unless otherwise specified. @@ -158,6 +152,11 @@ timezone: Europe/Berlin # Provide extra flags to the "ngrok http" command, see # https://ngrok.com/docs#http or run "ngrok http -h" +# disable_settings_management: false +# If true, ddev will not create CMS-specific settings files like +# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalSettings.php +# In this case the user must provide all such settings. + # provider: default # Currently either "default" or "pantheon" # # Many ddev commands can be extended to run tasks before or after the -- GitLab From 6a72ba314b01402ac6eaf494cb651b82a0388737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Wed, 1 Apr 2020 14:36:05 +0200 Subject: [PATCH 3/4] Fix php code style --- private/typo3conf/AdditionalConfiguration.ddev.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/private/typo3conf/AdditionalConfiguration.ddev.php b/private/typo3conf/AdditionalConfiguration.ddev.php index 33580304..02818dae 100644 --- a/private/typo3conf/AdditionalConfiguration.ddev.php +++ b/private/typo3conf/AdditionalConfiguration.ddev.php @@ -34,4 +34,5 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['cache_imag $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['l10n']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_object']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_reflection']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; -$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; \ No newline at end of file +$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; + -- GitLab From c836fb7aad0359762663cc2aabfb3db530f67e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Wed, 1 Apr 2020 15:17:22 +0200 Subject: [PATCH 4/4] Remove obsolete line --- private/typo3conf/AdditionalConfiguration.ddev.php | 1 - 1 file changed, 1 deletion(-) diff --git a/private/typo3conf/AdditionalConfiguration.ddev.php b/private/typo3conf/AdditionalConfiguration.ddev.php index 02818dae..c3d216b9 100644 --- a/private/typo3conf/AdditionalConfiguration.ddev.php +++ b/private/typo3conf/AdditionalConfiguration.ddev.php @@ -35,4 +35,3 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['l10n']['ba $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_object']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_reflection']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['extbase_datamapfactory_datamap']['backend'] = \TYPO3\CMS\Core\Cache\Backend\NullBackend::class; - -- GitLab