Update the ddev configuration to the latest version

This commit is contained in:
David Valdez 2020-02-14 15:28:30 -06:00
parent fcf4de7dee
commit 43d7697c0e
2 changed files with 35 additions and 24 deletions

9
.ddev/.gitignore vendored
View file

@ -1,6 +1,13 @@
#ddev-generated: Automatically generated ddev .gitignore. #ddev-generated: Automatically generated ddev .gitignore.
# You can remove the above line if you want to edit and maintain this file yourself. # You can remove the above line if you want to edit and maintain this file yourself.
/commands/*/*.example
/commands/*/README.txt
/commands/host/launch
/commands/db/mysql
/homeadditions/*.example
/homeadditions/README.txt
/.gitignore
/import.yaml /import.yaml
/docker-compose.yaml /docker-compose.yaml
/db_snapshots /db_snapshots
@ -14,6 +21,4 @@
/.sshimageBuild /.sshimageBuild
/.webimageExtra /.webimageExtra
/.dbimageExtra /.dbimageExtra
/.webimageBuild
/.dbimageBuild
/*-build/Dockerfile.example /*-build/Dockerfile.example

View file

@ -1,4 +1,4 @@
APIVersion: v1.10.1 APIVersion: v1.12.2
name: agaric-coop name: agaric-coop
type: drupal8 type: drupal8
docroot: web docroot: web
@ -12,15 +12,15 @@ additional_fqdns: []
mariadb_version: "10.2" mariadb_version: "10.2"
nfs_mount_enabled: false nfs_mount_enabled: false
provider: default provider: default
use_dns_when_possible: true use_dns_when_possible: false
timezone: "" timezone: ""
# This config.yaml was created with ddev version v1.10.1 # This config.yaml was created with ddev version v1.12.2
# webimage: drud/ddev-webserver:v1.10.0 # webimage: drud/ddev-webserver:v1.12.2
# dbimage: drud/ddev-dbserver:v1.10.0-10.2 # dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0
# dbaimage: drud/phpmyadmin:v1.10.0 # dbaimage: drud/phpmyadmin:v1.12.0
# bgsyncimage: drud/ddev-bgsync:v1.10.0 # bgsyncimage: drud/ddev-bgsync:v1.12.0
# However we do not recommend explicitly wiring these images into the # However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev. # config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'. # You can update this config.yaml using 'ddev config'.
@ -34,7 +34,7 @@ timezone: ""
# docroot: <relative_path> # Relative path to the directory containing index.php. # docroot: <relative_path> # Relative path to the directory containing index.php.
# php_version: "7.2" # 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", "7.4"
# You can explicitly specify the webimage, dbimage, dbaimage lines but this # 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, # is not recommended, as the images are often closely tied to ddev's' behavior,
@ -45,11 +45,17 @@ timezone: ""
# dbaimage: <docker_image> # dbaimage: <docker_image>
# bgsyncimage: <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_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443) # router_https_port: <port> # Port for https (defaults to 443)
# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart" # xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands # Note that for most people the commands
# "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better, # "ddev exec enable_xdebug" and "ddev exec disable_xdebug" work better,
# as leaving xdebug enabled all the time is a big performance hit. # as leaving xdebug enabled all the time is a big performance hit.
@ -57,7 +63,7 @@ timezone: ""
# timezone: Europe/Berlin # timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP; # This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone, # it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT # For example Europe/Dublin or MST7MDT
@ -79,14 +85,14 @@ timezone: ""
# working_dir: # working_dir:
# web: /var/www/html # web: /var/www/html
# db: /home # db: /home
# would set the default working directory for the web and db services. # would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the # These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run. # directory in which commands passed into ddev exec are run.
# omit_containers: ["dba", "ddev-ssh-agent"] # omit_containers: ["dba", "ddev-ssh-agent"]
# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently # would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
# only those two containers can be omitted here. # 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. # ~/.ddev/global_config.yaml or with the "ddev config global" command.
# nfs_mount_enabled: false # nfs_mount_enabled: false
@ -94,8 +100,8 @@ timezone: ""
# See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container # See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container
# webcache_enabled: false (deprecated) # webcache_enabled: false (deprecated)
# Was only for macOS, but now 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" # host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is # The host port binding for https can be explicitly specified. It is
@ -125,9 +131,9 @@ timezone: ""
# dbimage_extra_packages: [telnet,netcat] # dbimage_extra_packages: [telnet,netcat]
# Extra Debian packages that are needed in the dbimage can be added here # Extra Debian packages that are needed in the dbimage can be added here
use_dns_when_possible: false # use_dns_when_possible: true
# If the host has internet access and the domain configured can # If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution # successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts # instead of editing /etc/hosts
# Defaults to true # Defaults to true
@ -138,13 +144,13 @@ use_dns_when_possible: false
# pre-v1.9 behavior. # pre-v1.9 behavior.
# ngrok_args: --subdomain mysite --auth username:pass # ngrok_args: --subdomain mysite --auth username:pass
# Provide extra flags to the "ngrok http" command, see # Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h" # https://ngrok.com/docs#http or run "ngrok http -h"
# provider: default # Currently either "default" or "pantheon" # provider: default # Currently either "default" or "pantheon"
# #
# Many ddev commands can be extended to run tasks before or after the # Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db", # ddev command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer" # "pre-composer", "post-composer"
# See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more # 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 # information on the commands that can be extended and the tasks you can define