From 7fc7afb3e2d6ed9c0103b910e279487b60da7d6c Mon Sep 17 00:00:00 2001 From: Benjamin Kott Date: Sun, 30 Jun 2019 09:58:59 +0200 Subject: [PATCH] [TASK] Update ddev to 1.9.1 --- .ddev/.gitignore | 3 ++ .ddev/config.yaml | 78 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 64 insertions(+), 17 deletions(-) diff --git a/.ddev/.gitignore b/.ddev/.gitignore index b23a82cc..e1eb658e 100644 --- a/.ddev/.gitignore +++ b/.ddev/.gitignore @@ -8,3 +8,6 @@ /import-db /.bgsync* /config.*.y*ml +/.webimageExtra +/.dbimageExtra +/*-build/Dockerfile.example diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 0d96d0c3..eb920537 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.7.1 +APIVersion: v1.9.1 name: blog type: typo3 docroot: .build/web @@ -10,16 +10,17 @@ xdebug_enabled: true additional_hostnames: [] additional_fqdns: [] mariadb_version: "10.2" -webcache_enabled: false nfs_mount_enabled: false provider: default +use_dns_when_possible: true +timezone: "" -# This config.yaml was created with ddev version v1.7.1 -# webimage: drud/ddev-webserver:v1.7.0 -# dbimage: drud/ddev-dbserver:v1.7.0-10.2 -# dbaimage: drud/phpmyadmin:v1.7.0 -# bgsyncimage: drud/ddev-bgsync:v1.7.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'. @@ -27,7 +28,7 @@ provider: default # Key features of ddev's config.yaml: # name: # 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: # drupal6/7/8, backdrop, typo3, wordpress, php @@ -54,8 +55,8 @@ provider: default # 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 @@ -69,16 +70,30 @@ provider: default # working_dir: # web: /var/www/html # db: /home -# would set the default working directory for the web and db services. -# These values specify the destination directory for ddev ssh and the -# directory in which commands passed into ddev exec are run. +# would set the default working directory for the web and db services. +# These values specify the destination directory for ddev ssh and the +# directory in which commands passed into ddev exec are run. # 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 +# Note that these containers can also be omitted globally in the # ~/.ddev/global_config.yaml or with the "ddev config global" command. +# nfs_mount_enabled: false +# 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 + +# 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 + +# host_https_port: "59002" +# The host port binding for https can be explicitly specified. It is +# dynamic unless otherwise specified. +# This is not used by most people, most people use the *router* instead +# of the localhost port. + # host_webserver_port: "59001" # The host port binding for the ddev-webserver can be explicitly specified. It is # dynamic unless otherwise specified. @@ -89,14 +104,43 @@ provider: default # 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 + +# dbimage_extra_packages: [telnet,netcat] +# 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: #hooks: # post-start: -# - exec: composer install -d /var/www/html \ No newline at end of file +# - exec: composer install -d /var/www/html