Commit 9eed6a91 authored by Stefan Busemann's avatar Stefan Busemann
Browse files

Merge branch 'develop' into 'main'

Release 19-08-2021

See merge request !445
parents d6d1b57e 9e33d9d2
Pipeline #15303 passed with stages
in 7 minutes and 6 seconds
#ddev-generated: Automatically generated ddev .gitignore.
# You can remove the above line if you want to edit and maintain this file yourself.
/.gitignore
/**/*.example
/.dbimageBuild
/.dbimageExtra
/.ddev-docker-*.yaml
/.*downloads
/.global_commands
/.homeadditions
/.sshimageBuild
/.webimageBuild
/.webimageExtra
/apache/apache-site.conf
/commands/.gitattributes
/commands/db/mysql
/commands/host/launch
/commands/web/xdebug
/commands/web/live
/config.*.y*ml
/db_snapshots
/import-db
/import.yaml
/mutagen.yml
/nginx_full/nginx-site.conf
/sequelpro.spf
/**/README.*
......@@ -10,7 +10,8 @@ additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.3"
mysql_version: ""
provider: default
nfs_mount_enabled: false
mutagen_enabled: false
hooks:
post-import-db:
- exec: ./vendor/bin/typo3cms database:updateschema
......@@ -23,11 +24,12 @@ webimage_extra_packages: [php7.4-ldap]
use_dns_when_possible: true
timezone: Europe/Berlin
composer_version: "2"
web_environment: []
# This config.yaml was created with ddev version v1.16.2
# webimage: drud/ddev-webserver:v1.16.2
# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.16.0
# This config.yaml was created with ddev version v1.18.0-alpha4
# webimage: drud/ddev-webserver:20210729_cspitzlay_mysql_history
# dbimage: drud/ddev-dbserver-mariadb-10.3:20210729_cspitzlay_mysql_history
# dbaimage: phpmyadmin:5
# However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev.
......@@ -42,7 +44,7 @@ composer_version: "2"
# docroot: <relative_path> # Relative path to the directory containing index.php.
# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"
# php_version: "7.4" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"
# 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,
......@@ -66,6 +68,11 @@ composer_version: "2"
# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
# as leaving xdebug enabled all the time is a big performance hit.
# xhprof_enabled: false # Set to true to enable xhprof and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xhprof" to enable xhprof and "ddev xhprof off" to disable it work better,
# as leaving xhprof enabled all the time is a big performance hit.
# webserver_type: nginx-fpm # or apache-fpm
# timezone: Europe/Berlin
......@@ -74,7 +81,7 @@ composer_version: "2"
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT
# composer_version: "2"
# composer_version: ""
# if composer_version:"" it will use the current ddev default composer release.
# It can also be set to "1", to get most recent composer v1
# or "2" for most recent composer v2.
......@@ -113,6 +120,13 @@ composer_version: "2"
# 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
# mutagen_enabled: false
# Experimental performance improvement using mutagen asynchronous updates.
# See https://ddev.readthedocs.io/en/latest/users/performance/#using-mutagen
# fail_on_hook_fail: False
# Decide whether 'ddev start' should be interrupted by a failing hook
# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
# dynamic unless otherwise specified.
......@@ -137,7 +151,7 @@ composer_version: "2"
# mailhog_https_port: "8026"
# The MailHog ports can be changed from the default 8025 and 8026
# webimage_extra_packages: [php7.3-tidy, php-bcmath]
# webimage_extra_packages: [php7.4-tidy, php-bcmath]
# Extra Debian packages that are needed in the webimage can be added here
# dbimage_extra_packages: [telnet,netcat]
......@@ -161,17 +175,20 @@ composer_version: "2"
# 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
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
# In this case the user must provide all such settings.
# You can inject environment variables into the web container with:
# web_environment:
# - SOMEENV=somevalue
# - SOMEOTHERENV=someothervalue
# no_project_mount: false
# (Experimental) If true, ddev will not mount the project into the web container;
# the user is responsible for mounting it manually or via a script.
# This is to enable experimentation with alternate file mounting strategies.
# For advanced users only!
# provider: default # Currently either "default" or "pantheon"
#
# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer"
......
# You can copy this Dockerfile.example to Dockerfile to add configuration
# or packages or anything else to your dbimage
ARG BASE_IMAGE=drud/ddev-dbserver:v1.6.0-10.1
FROM $BASE_IMAGE
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y telnet netcat
RUN echo "Built from drud/ddev-dbserver:v1.6.0-10.1" >/var/tmp/built-from.txt
# You can copy this Dockerfile.example to Dockerfile to add configuration
# or packages or anything else to your webimage
ARG BASE_IMAGE=drud/ddev-webserver:v1.8.0
FROM $BASE_IMAGE
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y php-yaml
RUN npm install --global gulp-cli
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime && dpkg-reconfigure --frontend noninteractive tzdata
......@@ -1918,40 +1918,6 @@
},
"time": "2021-02-22T10:52:38+00:00"
},
{
"name": "lukebaird/dropbox-v2-php-sdk",
"version": "1.1.9",
"source": {
"type": "git",
"url": "https://github.com/lukeb2014/Dropbox-v2-PHP-SDK.git",
"reference": "9c6e7fdce05478611d91c1394d4e7e93a81d1084"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/lukeb2014/Dropbox-v2-PHP-SDK/zipball/9c6e7fdce05478611d91c1394d4e7e93a81d1084",
"reference": "9c6e7fdce05478611d91c1394d4e7e93a81d1084",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Dropbox\\": "sdk/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "A Dropbox SDK to work with the v2 API",
"support": {
"issues": "https://github.com/lukeb2014/Dropbox-v2-PHP-SDK/issues",
"source": "https://github.com/lukeb2014/Dropbox-v2-PHP-SDK/tree/master"
},
"time": "2019-02-08T20:49:04+00:00"
},
{
"name": "masterminds/html5",
"version": "2.7.5",
......@@ -6706,15 +6672,19 @@
},
{
"name": "t3o/t3o_membership",
"version": "3.0.7",
"version": "3.9.0",
"source": {
"type": "git",
"url": "https://gitlab.typo3.org/services/t3o-sites/typo3.org/t3o_membership.git",
"reference": "c8b915423010ee42b355affb31d2fa35f598d17c"
},
"dist": {
"type": "zip",
"url": "https://gitlab.typo3.org/api/v4/projects/14/packages/composer/archives/t3o/t3o_membership.zip?sha=02460b3fc2de26e309eea960a14d6f53b39a22e5",
"reference": "02460b3fc2de26e309eea960a14d6f53b39a22e5",
"url": "https://gitlab.typo3.org/api/v4/projects/14/packages/composer/archives/t3o/t3o_membership.zip?sha=c8b915423010ee42b355affb31d2fa35f598d17c",
"reference": "c8b915423010ee42b355affb31d2fa35f598d17c",
"shasum": ""
},
"require": {
"lukebaird/dropbox-v2-php-sdk": "^1.1",
"typo3/cms-core": "10.3.0 - 10.9.99"
},
"replace": {
......@@ -9451,16 +9421,16 @@
},
{
"name": "yoast-seo-for-typo3/yoast_seo",
"version": "7.2.0",
"version": "7.2.4",
"source": {
"type": "git",
"url": "https://github.com/Yoast/Yoast-SEO-for-TYPO3.git",
"reference": "8a122cd58eaa3e114001bcaab1e05225ba37fce0"
"reference": "1d5ee47319dcfd0921714a3ff0eed4d6b1342c3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Yoast/Yoast-SEO-for-TYPO3/zipball/8a122cd58eaa3e114001bcaab1e05225ba37fce0",
"reference": "8a122cd58eaa3e114001bcaab1e05225ba37fce0",
"url": "https://api.github.com/repos/Yoast/Yoast-SEO-for-TYPO3/zipball/1d5ee47319dcfd0921714a3ff0eed4d6b1342c3e",
"reference": "1d5ee47319dcfd0921714a3ff0eed4d6b1342c3e",
"shasum": ""
},
"require": {
......@@ -9496,7 +9466,8 @@
},
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": "public"
"web-dir": "public",
"extension-key": "yoast_seo"
}
},
"autoload": {
......@@ -9530,9 +9501,9 @@
],
"support": {
"issues": "https://github.com/Yoast/Yoast-SEO-for-TYPO3/issues",
"source": "https://github.com/Yoast/Yoast-SEO-for-TYPO3/tree/7.2.0"
"source": "https://github.com/Yoast/Yoast-SEO-for-TYPO3/tree/7.2.4"
},
"time": "2021-02-19T08:29:06+00:00"
"time": "2021-08-12T15:50:19+00:00"
}
],
"packages-dev": [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment