From c87eb313418aacb15f1d77f5bc0034165ea39faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lo=CC=88ffler?= Date: Thu, 13 Sep 2018 14:07:08 +0200 Subject: [PATCH 1/2] Update to ddev v1.2.0 --- .ddev/config.yaml | 31 ++++++++++++++++++------------- .ddev/docker-compose.solr.yaml | 2 +- .ddev/docker-compose.typo3.yaml | 4 ++-- .ddev/docker-compose.yaml | 25 +++++++++++++++++++------ .gitignore | 1 + html/typo3conf/.gitignore | 4 ++++ 6 files changed, 45 insertions(+), 22 deletions(-) create mode 100644 html/typo3conf/.gitignore diff --git a/.ddev/config.yaml b/.ddev/config.yaml index f02cd37..a07d5cb 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,8 +1,9 @@ -APIVersion: v1.0.0 +APIVersion: v1.2.0 name: typo3.org type: typo3 docroot: html php_version: "7.0" +webserver_type: nginx-fpm router_http_port: "80" router_https_port: "443" xdebug_enabled: false @@ -17,14 +18,13 @@ hooks: - exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build - exec: ../vendor/bin/typo3cms install:generatepackagestates - exec: ../vendor/bin/typo3cms install:extensionsetupifpossible - # temporary activation of redirects until upgrade to v9 - exec: ../vendor/bin/typo3cms extension:activate redirects -# This config.yaml was created with ddev version v1.0.0 -# webimage: drud/ddev-webserver:v1.0.0 -# dbimage: drud/ddev-dbserver:v1.0.0 -# dbaimage: drud/phpmyadmin:v1.0.0 +# This config.yaml was created with ddev version v1.2.0 +# webimage: drud/ddev-webserver:v1.2.0 +# dbimage: drud/ddev-dbserver:v1.2.0 +# dbaimage: drud/phpmyadmin:v1.2.0 # 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'. @@ -53,18 +53,23 @@ hooks: # xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart" -#additional_hostnames: -# - somename -# - someothername +# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well + +# additional_hostnames: +# - somename +# - someothername # would provide http and https URLs for "somename.ddev.local" # and "someothername.ddev.local". -#additional_fqdns: -# - example.com -# - sub1.example.com +# additional_fqdns: +# - example.com +# - sub1.example.com # would provide http and https URLs for "example.com" and "sub1.example.com" # Please take care with this because it can cause great confusion. +# upload_dir: custom/upload/dir +# would set the destination path for ddev import-files to custom/upload/dir. + # provider: default # Currently either "default" or "pantheon" # # Many ddev commands can be extended to run tasks after the ddev command is @@ -74,4 +79,4 @@ hooks: # for them. Example: #hooks: # post-start: -# - exec: "composer install -d /var/www/html" +# - exec: composer install -d /var/www/html \ No newline at end of file diff --git a/.ddev/docker-compose.solr.yaml b/.ddev/docker-compose.solr.yaml index e8b267d..44ebe33 100644 --- a/.ddev/docker-compose.solr.yaml +++ b/.ddev/docker-compose.solr.yaml @@ -6,7 +6,7 @@ # you would copy the solr-conf/5.x/ contents into .ddev/solr/conf. The configuration # files must be present before running `ddev start`. -version: '3' +version: '3.6' services: solr: # This is the service name used when running ddev commands accepting the --service flag diff --git a/.ddev/docker-compose.typo3.yaml b/.ddev/docker-compose.typo3.yaml index adf247d..8bc5748 100644 --- a/.ddev/docker-compose.typo3.yaml +++ b/.ddev/docker-compose.typo3.yaml @@ -1,6 +1,6 @@ -version: '3' +version: '3.6' services: web: environment: - - TYPO3_CONTEXT=Development \ No newline at end of file + - TYPO3_CONTEXT=Development diff --git a/.ddev/docker-compose.yaml b/.ddev/docker-compose.yaml index 484394b..ceb62fb 100644 --- a/.ddev/docker-compose.yaml +++ b/.ddev/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3' +version: '3.6' #ddev-generated services: db: @@ -6,9 +6,17 @@ services: image: $DDEV_DBIMAGE stop_grace_period: 60s volumes: - - "${DDEV_IMPORTDIR}:/db" - - "${DDEV_DATADIR}:/var/lib/mysql" - - ".:/mnt/ddev_config" + - type: "volume" + source: mariadb-database + target: "/var/lib/mysql" + volume: + nocopy: true + - type: "bind" + source: "${DDEV_IMPORTDIR}" + target: "/db" + - type: "bind" + source: "." + target: "/mnt/ddev_config" restart: "no" user: "$DDEV_UID:$DDEV_GID" ports: @@ -22,13 +30,13 @@ services: environment: - COLUMNS=$COLUMNS - LINES=$LINES - + command: "$DDEV_MARIADB_LOCAL_COMMAND" web: container_name: ddev-${DDEV_SITENAME}-web image: $DDEV_WEBIMAGE volumes: - "../:/var/www/html:cached" - - ".:/mnt/ddev_config" + - ".:/mnt/ddev_config:ro" restart: "no" user: "$DDEV_UID:$DDEV_GID" depends_on: @@ -44,6 +52,7 @@ services: - DDEV_URL=$DDEV_URL - DOCROOT=$DDEV_DOCROOT - DDEV_PHP_VERSION=$DDEV_PHP_VERSION + - DDEV_WEBSERVER_TYPE=$DDEV_WEBSERVER_TYPE - DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE - DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT - DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT @@ -91,3 +100,7 @@ networks: default: external: name: ddev_default +volumes: + mariadb-database: + name: "${DDEV_SITENAME}-mariadb" + diff --git a/.gitignore b/.gitignore index fb9be43..20ea83c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ html/services/api-keys.php /auth.json /assets/ sequelpro.spf +.ddev/db_snapshots/ diff --git a/html/typo3conf/.gitignore b/html/typo3conf/.gitignore new file mode 100644 index 0000000..2933363 --- /dev/null +++ b/html/typo3conf/.gitignore @@ -0,0 +1,4 @@ +#ddev-generated: Automatically generated ddev .gitignore. + +/AdditionalConfiguration.php +/ddev_drush_settings.php -- GitLab From 20682d0816068b2cd300e7fbb0102570caf5a267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lo=CC=88ffler?= Date: Wed, 26 Sep 2018 07:44:40 +0200 Subject: [PATCH 2/2] Update TYPO3 CMS to 8.7.19 --- composer.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index abed963..6a5bc7b 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "39e3c0f2f327066c459b9d7985f3ea53", @@ -1943,7 +1943,7 @@ }, { "name": "symfony/console", - "version": "v3.4.14", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -2012,16 +2012,16 @@ }, { "name": "symfony/debug", - "version": "v3.4.14", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc" + "reference": "c4625e75341e4fb309ce0c049cbf7fb84b8897cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc", - "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc", + "url": "https://api.github.com/repos/symfony/debug/zipball/c4625e75341e4fb309ce0c049cbf7fb84b8897cd", + "reference": "c4625e75341e4fb309ce0c049cbf7fb84b8897cd", "shasum": "" }, "require": { @@ -2064,7 +2064,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "time": "2018-08-03T10:42:44+00:00" }, { "name": "symfony/dependency-injection", @@ -2139,7 +2139,7 @@ }, { "name": "symfony/finder", - "version": "v3.4.14", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -2354,16 +2354,16 @@ }, { "name": "symfony/yaml", - "version": "v3.4.14", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2" + "reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", - "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c2f4812ead9f847cb69e90917ca7502e6892d6b8", + "reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8", "shasum": "" }, "require": { @@ -2409,7 +2409,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "time": "2018-08-10T07:34:36+00:00" }, { "name": "t3o/certifications", @@ -2700,16 +2700,16 @@ }, { "name": "typo3/cms", - "version": "v8.7.18", + "version": "v8.7.19", "source": { "type": "git", "url": "https://github.com/TYPO3/TYPO3.CMS.git", - "reference": "ce3bb04bebc4289fecf492005957f65165287ff0" + "reference": "05185631e8b98a81340442ac1dd0b163c2c771cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/ce3bb04bebc4289fecf492005957f65165287ff0", - "reference": "ce3bb04bebc4289fecf492005957f65165287ff0", + "url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/05185631e8b98a81340442ac1dd0b163c2c771cc", + "reference": "05185631e8b98a81340442ac1dd0b163c2c771cc", "shasum": "" }, "require": { @@ -2909,7 +2909,7 @@ "extbase", "typo3" ], - "time": "2018-07-31T08:15:29+00:00" + "time": "2018-08-21T07:23:21+00:00" }, { "name": "typo3/cms-composer-installers", -- GitLab