From cea44d4a62b1accf7baf34354c2f2f43ddd9e79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Sat, 24 Apr 2021 23:18:16 -0400 Subject: [PATCH] Commit updated ddev config (re-ran it) --- .ddev/.gitignore | 3 --- .ddev/config.yaml | 28 ++++++++++++++++++---------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.ddev/.gitignore b/.ddev/.gitignore index 82bf6f2..28eb786 100644 --- a/.ddev/.gitignore +++ b/.ddev/.gitignore @@ -5,9 +5,6 @@ /**/*.example /.dbimageBuild /.dbimageExtra -/.ddev-docker-compose-base.yaml -/.ddev-docker-compose-full.yaml -/.ddevlive-downloads /.ddev-docker-*.yaml /.*downloads /.global_commands diff --git a/.ddev/config.yaml b/.ddev/config.yaml index ca00a55..a2a6dab 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -10,14 +10,14 @@ additional_hostnames: [] additional_fqdns: [] mariadb_version: "10.3" mysql_version: "" -provider: default use_dns_when_possible: false composer_version: "2" +web_environment: [] -# This config.yaml was created with ddev version v1.16.7 -# webimage: drud/ddev-webserver:v1.16.7 -# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.16.0 +# This config.yaml was created with ddev version v1.17.1 +# webimage: drud/ddev-webserver:v1.17.1 +# dbimage: drud/ddev-dbserver-mariadb-10.3:v1.17.0 # dbaimage: phpmyadmin:5 # However we do not recommend explicitly wiring these images into the # config.yaml as they may break future versions of ddev. @@ -32,7 +32,7 @@ composer_version: "2" # docroot: # Relative path to the directory containing index.php. -# php_version: "7.3" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0" +# php_version: "7.4" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0" # 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, @@ -64,7 +64,7 @@ composer_version: "2" # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones # For example Europe/Dublin or MST7MDT -# composer_version: "2" +# composer_version: "" # if composer_version:"" it will use the current ddev default composer release. # It can also be set to "1", to get most recent composer v1 # or "2" for most recent composer v2. @@ -103,6 +103,9 @@ composer_version: "2" # 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 +# fail_on_hook_fail: False +# Decide whether 'ddev start' should be interrupted by a failing hook + # host_https_port: "59002" # The host port binding for https can be explicitly specified. It is # dynamic unless otherwise specified. @@ -127,7 +130,7 @@ composer_version: "2" # mailhog_https_port: "8026" # The MailHog ports can be changed from the default 8025 and 8026 -# webimage_extra_packages: [php7.3-tidy, php-bcmath] +# webimage_extra_packages: [php7.4-tidy, php-bcmath] # Extra Debian packages that are needed in the webimage can be added here # dbimage_extra_packages: [telnet,netcat] @@ -151,17 +154,22 @@ composer_version: "2" # disable_settings_management: false # If true, ddev will not create CMS-specific settings files like -# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalSettings.php +# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php # In this case the user must provide all such settings. +# You can inject environment variables into the web container with: +# web_environment: +# - SOMEENV=somevalue +# - SOMEOTHERENV=someothervalue + # no_project_mount: false # (Experimental) If true, ddev will not mount the project into the web container; # the user is responsible for mounting it manually or via a script. # This is to enable experimentation with alternate file mounting strategies. # For advanced users only! -# provider: default # Currently either "default" or "pantheon" -# +# provider: default # Currently "default", "pantheon", "ddev-live" +# # 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"