diff --git a/.ddev/.gitignore b/.ddev/.gitignore index e1eb658..9dc56c8 100644 --- a/.ddev/.gitignore +++ b/.ddev/.gitignore @@ -8,6 +8,12 @@ /import-db /.bgsync* /config.*.y*ml +/.webimageBuild +/.dbimageBuild +/.bgsyncimageBuild +/.sshimageBuild /.webimageExtra /.dbimageExtra +/.webimageBuild +/.dbimageBuild /*-build/Dockerfile.example diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 07bacbc..2f334a9 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.9.1 +APIVersion: v1.10.1 name: geo type: drupal8 docroot: web @@ -16,11 +16,11 @@ use_dns_when_possible: true timezone: "" -# 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 +# This config.yaml was created with ddev version v1.10.1 +# webimage: drud/ddev-webserver:v1.10.0 +# dbimage: drud/ddev-dbserver:v1.10.0-10.2 +# dbaimage: drud/phpmyadmin:v1.10.0 +# bgsyncimage: drud/ddev-bgsync:v1.10.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'. @@ -34,7 +34,7 @@ timezone: "" # docroot: # Relative path to the directory containing index.php. -# php_version: "7.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3" +# php_version: "7.2" # 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, @@ -49,9 +49,18 @@ timezone: "" # router_https_port: # Port for https (defaults to 443) # xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart" +# Note that for most people the commands +# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better, +# as leaving xdebug enabled all the time is a big performance hit. # webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well +# timezone: Europe/Berlin +# This is the timezone used in the containers and by PHP; +# it can be set to any valid timezone, +# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones +# For example Europe/Dublin or MST7MDT + # additional_hostnames: # - somename # - someothername @@ -112,11 +121,9 @@ timezone: "" # 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 @@ -127,9 +134,10 @@ timezone: "" # 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" +# If you prefer you can change this to "ddev.local" to preserve +# pre-v1.9 behavior. -# ngrok_args: --subdomain mysite --auth "user:pass" +# ngrok_args: --subdomain mysite --auth username:pass # Provide extra flags to the "ngrok http" command, see # https://ngrok.com/docs#http or run "ngrok http -h"