Merge branch '406-update-ddev-to-1-9-1' into 'develop'

Resolve "Update DDEV to 1.9.1"

Closes #406

See merge request t3o/my!169

.ddev/.gitignore

@@ -8,6 +8,6 @@
 /import-db
 /.bgsync*
 /config.*.y*ml
-/.webImageExtra
-/.dbImageExtra
+/.webimageExtra
+/.dbimageExtra
 /*-build/Dockerfile.example

.ddev/config.yaml

-APIVersion: v1.8.0
+APIVersion: v1.9.1
 name: my.typo3.org
 type: typo3
 docroot: public
 php_version: "7.2"
 webserver_type: nginx-fpm
-dbimage: drud/ddev-dbserver:v1.8.0-10.1
 router_http_port: "80"
 router_https_port: "443"
 xdebug_enabled: false
@@ -15,23 +14,22 @@ nfs_mount_enabled: false
 provider: default
 hooks:
   post-start:
-  - exec: bash -c "sudo -E apt-get update"
-  - exec: bash -c "sudo -E apt-get install --yes --no-install-recommends apt-utils"
-  - exec: bash -c "sudo -E apt-get install --yes php7.2-ldap -o Dpkg::Options::=\"--force-confdef\"
-      -o Dpkg::Options::=\"--force-confold\" && killall -HUP php-fpm"
   - exec: cp private/typo3conf/AdditionalConfiguration.ddev.php private/typo3conf/AdditionalConfiguration.php
   - exec: composer install
   - exec: npm --prefix private/typo3conf/ext/t3olayout/Build install
   - exec: npm --prefix private/typo3conf/ext/t3olayout/Build run-script build
   - exec: vendor/bin/typo3cms install:generatepackagestates
   - exec: vendor/bin/typo3cms install:extensionsetupifpossible
+webimage_extra_packages: [php7.2-ldap]
+use_dns_when_possible: true
+timezone: Europe/Berlin
 
 
-# This config.yaml was created with ddev version v1.8.0 
-# webimage: drud/ddev-webserver:v1.8.0
-# dbimage: drud/ddev-dbserver:v1.8.0-10.2
-# dbaimage: drud/phpmyadmin:v1.8.0
-# bgsyncimage: drud/ddev-bgsync:v1.8.0
+# This config.yaml was created with ddev version v1.9.1 
+# webimage: drud/ddev-webserver:v1.9.0
+# dbimage: drud/ddev-dbserver:v1.9.0-10.2
+# dbaimage: drud/phpmyadmin:v1.9.0
+# bgsyncimage: drud/ddev-bgsync:v1.9.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 +37,7 @@ hooks:
 # Key features of ddev's config.yaml:
 
 # name: <projectname> # Name of the project, automatically provides
-#   http://projectname.ddev.local and https://projectname.ddev.local
+#   http://projectname.ddev.site and https://projectname.ddev.site
 
 # type: <projecttype>  # drupal6/7/8, backdrop, typo3, wordpress, php
 
@@ -66,8 +64,8 @@ hooks:
 # additional_hostnames:
 #  - somename
 #  - someothername
-# would provide http and https URLs for "somename.ddev.local"
-# and "someothername.ddev.local".
+# would provide http and https URLs for "somename.ddev.site"
+# and "someothername.ddev.site".
 
 # additional_fqdns:
 #  - example.com
@@ -115,6 +113,12 @@ hooks:
 # The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
 # unless explicitly specified.
 
+# phpmyadmin_port: "1000"
+# The PHPMyAdmin port can be changed from the default 8036
+
+# mailhog_port: "1001"
+# The MailHog port can be changed from the default 8025
+
 # webimage_extra_packages: [php-yaml, php7.3-ldap]
 # Extra Debian packages that are needed in the webimage can be added here
 # This is ignored if a free-form .ddev/web-build/Dockerfile is provided
@@ -123,10 +127,26 @@ hooks:
 # Extra Debian packages that are needed in the dbimage can be added here
 # This is ignored if a free-form .ddev/db-build/Dockerfile is provided
 
+# use_dns_when_possible: true
+# If the host has internet access and the domain configured can 
+# successfully be looked up, DNS will be used for hostname resolution 
+# instead of editing /etc/hosts
+# Defaults to true
+
+# project_tld: ddev.site
+# The top-level domain used for project URLs
+# The default "ddev.site" allows DNS lookup via a wildcard
+# For backward compatibility this can be changed to "ddev.local"
+
+# ngrok_args: --subdomain mysite --auth "user:pass"
+# Provide extra flags to the "ngrok http" command, see 
+# https://ngrok.com/docs#http or run "ngrok http -h"
+
 # provider: default # Currently either "default" or "pantheon"
 #
-# Many ddev commands can be extended to run tasks after the ddev command is
-# executed.
+# 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"
 # See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
 # information on the commands that can be extended and the tasks you can define
 # for them. Example:

.ddev/docker-compose.typo3.yaml

@@ -4,4 +4,3 @@ services:
   web:
     environment:
       - TYPO3_CONTEXT=Development
-      - DEBIAN_FRONTEND=noninteractive

install-ldap.sh

-#!/bin/bash
-
-# You need to execute this file, whenever you start a project, where you want to use an ldap connection.
-# This script will add the ldap module to the nginx-php container from ddev.
-# Afterwards you need to restart your ddev project: ddev stop && ddev start
-
-docker exec -u root -it ddev-my.typo3.org-web apt update
-docker exec -u root -it ddev-my.typo3.org-web apt install php7.0-ldap
-
-