From c58766d7b576a299cb32dce5206abf187a3ce4f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lo=CC=88ffler?= <loeffler@spooner-web.de>
Date: Thu, 20 Dec 2018 08:47:55 +0100
Subject: [PATCH] Update to ddev 1.5.0

---
 .ddev/config.yaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.ddev/config.yaml b/.ddev/config.yaml
index c2afe26..5ed65a5 100644
--- a/.ddev/config.yaml
+++ b/.ddev/config.yaml
@@ -1,15 +1,16 @@
-APIVersion: v1.4.1
+APIVersion: v1.5.0
 name: typo3.org
 type: typo3
 docroot: html
 php_version: "7.0"
 webserver_type: nginx-fpm
-dbimage: drud/ddev-dbserver:v1.2.0
 router_http_port: "80"
 router_https_port: "443"
 xdebug_enabled: false
 additional_hostnames: []
 additional_fqdns: []
+mariadb_version: "10.1"
+webcache_enabled: false
 provider: default
 hooks:
   post-start:
@@ -22,10 +23,11 @@ hooks:
   - exec: ./vendor/bin/typo3cms extension:activate redirects
 
 
-# This config.yaml was created with ddev version v1.4.1 
-# webimage: drud/ddev-webserver:v1.4.0
-# dbimage: drud/ddev-dbserver:v1.4.0
-# dbaimage: drud/phpmyadmin:v1.4.0
+# This config.yaml was created with ddev version v1.5.0 
+# webimage: drud/ddev-webserver:v1.5.0
+# dbimage: drud/ddev-dbserver:v1.5.0-10.2
+# dbaimage: drud/phpmyadmin:v1.5.0
+# bgsyncimage: drud/ddev-bgsync:v1.5.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'.
@@ -39,7 +41,7 @@ hooks:
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "7.1"  # PHP version to use, "5.6", "7.0", "7.1", "7.2"
+# php_version: "7.1"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3"
 
 # 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,
@@ -48,6 +50,7 @@ hooks:
 # webimage: <docker_image>  # nginx/php docker image.
 # dbimage: <docker_image>  # mariadb docker image.
 # dbaimage: <docker_image>
+# bgsyncimage: <docker_image>
 
 # router_http_port: <port>  # Port to be used for http (defaults to port 80)
 # router_https_port: <port> # Port for https (defaults to 443)
@@ -81,6 +84,8 @@ hooks:
 # omit_containers: ["dba", "ddev-ssh-agent"]
 # would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
 # only those two containers can be omitted here.
+# Note that these containers can also be omitted globally in the 
+# ~/.ddev/global_config.yaml or with the "ddev config global" command.
 
 
 # provider: default # Currently either "default" or "pantheon"
-- 
GitLab