Commit 8b1e06c1 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch '468-update-ddev-config-to-1-12-0' into 'develop'

Resolve "Update DDEV config to 1.12.0"

Closes #468

See merge request !189
parents 2a0f2ff3 ca3e6557
Pipeline #8217 passed with stages
in 5 minutes
......@@ -3,8 +3,11 @@
/commands/*/*.example
/commands/*/README.txt
/commands/host/launch
/commands/db/mysql
/homeadditions/*.example
/homeadditions/README.txt
/.gitignore
/import.yaml
/docker-compose.yaml
/db_snapshots
......
APIVersion: v1.11.2
APIVersion: v1.12.0
name: my.typo3.org
type: typo3
docroot: public
......@@ -25,11 +25,11 @@ use_dns_when_possible: true
timezone: Europe/Berlin
# This config.yaml was created with ddev version v1.11.2
# webimage: drud/ddev-webserver:v1.11.0
# dbimage: drud/ddev-dbserver:v1.11.0-10.2
# dbaimage: drud/phpmyadmin:v1.11.0
# bgsyncimage: drud/ddev-bgsync:v1.11.0
# This config.yaml was created with ddev version v1.12.0
# 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
# 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'.
......@@ -54,6 +54,12 @@ timezone: Europe/Berlin
# dbaimage: <docker_image>
# bgsyncimage: <docker_image>
# mariadb_version and mysql_version
# ddev can use many versions of mariadb and mysql
# However these directives are mutually exclusive
# mariadb_version: 10.2
# mysql_version: 8.0
# router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443)
......@@ -104,7 +110,7 @@ timezone: Europe/Berlin
# webcache_enabled: false (deprecated)
# Was only for macOS, but now deprecated.
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-webcache_enabled-to-cache-the-project-directory
# 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
......
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