From d107614a304312dae0fbfe25fbd696967d3df7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Mon, 12 Sep 2022 15:00:26 -0400 Subject: [PATCH] Update DDEV --- .ddev/.gitignore | 3 ++ .ddev/commands/db/mysql | 9 ---- .ddev/config.yaml | 100 ++++++++++++++++++++++++++++++++-------- 3 files changed, 84 insertions(+), 28 deletions(-) delete mode 100755 .ddev/commands/db/mysql diff --git a/.ddev/.gitignore b/.ddev/.gitignore index 500e5dc..8db0a72 100644 --- a/.ddev/.gitignore +++ b/.ddev/.gitignore @@ -9,6 +9,7 @@ /.*downloads /.global_commands /.homeadditions +/.importdb* /.sshimageBuild /.webimageBuild /.webimageExtra @@ -24,6 +25,8 @@ /import.yaml /mutagen /nginx_full/nginx-site.conf +/postgres/postgresql.conf +/providers/platform.yaml /sequelpro.spf /xhprof /**/README.* diff --git a/.ddev/commands/db/mysql b/.ddev/commands/db/mysql deleted file mode 100755 index 23a06db..0000000 --- a/.ddev/commands/db/mysql +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: run mysql client in db container -## Usage: mysql [flags] [args] -## Example: "ddev mysql" or "ddev mysql -uroot -proot" or "echo 'SHOW TABLES;' | ddev mysql" -## `ddev mysql --database=mysql -uroot -proot` gets you to the 'mysql' database with root privileges - -mysql -udb -pdb $@ diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 7c0d5a7..3e3f342 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -8,14 +8,16 @@ router_https_port: "443" xdebug_enabled: false additional_hostnames: [] additional_fqdns: [] -mariadb_version: "10.5" -mysql_version: "" +database: + type: mariadb + version: "10.5" nfs_mount_enabled: false mutagen_enabled: false webimage_extra_packages: [rake, sassc] use_dns_when_possible: false composer_version: "2" web_environment: [] +nodejs_version: "16" # Key features of ddev's config.yaml: @@ -28,19 +30,17 @@ web_environment: [] # php_version: "7.4" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1" -# You can explicitly specify the webimage, dbimage, dbaimage lines but this +# You can explicitly specify the webimage but this # is not recommended, as the images are often closely tied to ddev's' behavior, # so this can break upgrades. # webimage: # nginx/php docker image. -# dbimage: # mariadb docker image. -# dbaimage: -# 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 +# database: +# type: # mysql, mariadb +# version: # database version, like "10.3" or "8.0" +# Note that mariadb_version or mysql_version from v1.18 and earlier +# will automatically be converted to this notation with just a "ddev config --auto" # router_http_port: # Port to be used for http (defaults to port 80) # router_https_port: # Port for https (defaults to 443) @@ -63,12 +63,25 @@ web_environment: [] # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones # For example Europe/Dublin or MST7MDT +# composer_root: +# Relative path to the composer root directory from the project root. This is +# the directory which contains the composer.json and where all Composer related +# commands are executed. + # composer_version: "2" -# if composer_version:"2" it will use the most recent composer v2 -# It can also be set to "1", to get most recent composer v1 -# or "" for the default v2 created at release time. -# It can be set to any existing specific composer version. -# After first project 'ddev start' this will not be updated until it changes +# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1 +# to use the latest major version available at the time your container is built. +# It is also possible to select a minor version for example "2.2" which will +# install the latest release of that branch. Alternatively, an explicit Composer +# version may be specified, for example "1.0.22". Finally, it is also possible +# to use one of the key words "stable", "preview" or "snapshot" see Composer +# documentation. +# To reinstall Composer after the image was built, run "ddev debug refresh". + +# nodejs_version: "16" +# change from the default system Node.js version to another supported version, like 12, 14, 17, 18. +# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any +# Node.js version, including v6, etc. # additional_hostnames: # - somename @@ -83,7 +96,9 @@ web_environment: [] # Please take care with this because it can cause great confusion. # upload_dir: custom/upload/dir -# would set the destination path for ddev import-files to /custom/upload/dir +# would set the destination path for ddev import-files to /custom/upload/dir +# When mutagen is enabled this path is bind-mounted so that all the files +# in the upload_dir don't have to be synced into mutagen # working_dir: # web: /var/www/html @@ -104,7 +119,7 @@ web_environment: [] # See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container # mutagen_enabled: false -# Experimental performance improvement using mutagen asynchronous updates. +# Performance improvement using mutagen asynchronous updates. # See https://ddev.readthedocs.io/en/latest/users/performance/#using-mutagen # fail_on_hook_fail: False @@ -160,7 +175,7 @@ web_environment: [] # If you prefer you can change this to "ddev.local" to preserve # pre-v1.9 behavior. -# ngrok_args: --subdomain mysite --auth username:pass +# ngrok_args: --basic-auth username:pass1234 # Provide extra flags to the "ngrok http" command, see # https://ngrok.com/docs#http or run "ngrok http -h" @@ -186,10 +201,57 @@ web_environment: [] # will be available on the local network if the host firewall # allows it. +# default_container_timeout: 120 +# The default time that ddev waits for all containers to become ready can be increased from +# the default 120. This helps in importing huge databases, for example. + +#web_extra_exposed_ports: +#- name: nodejs +# container_port: 3000 +# http_port: 2999 +# https_port: 3000 +#- name: something +# container_port: 4000 +# https_port: 4000 +# http_port: 3999 +# Allows a set of extra ports to be exposed via ddev-router +# The port behavior on the ddev-webserver must be arranged separately, for example +# using web_extra_daemons. +# For example, with a web app on port 3000 inside the container, this config would +# expose that web app on https://.ddev.site:9999 and http://.ddev.site:9998 +# web_extra_exposed_ports: +# - container_port: 3000 +# http_port: 9998 +# https_port: 9999 + +#web_extra_daemons: +#- name: "http-1" +# command: "/var/www/html/node_modules/.bin/http-server -p 3000" +# directory: /var/www/html +#- name: "http-2" +# command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000" +# directory: /var/www/html + +# override_config: false +# By default, config.*.yaml files are *merged* into the configuration +# But this means that some things can't be overridden +# For example, if you have 'nfs_mount_enabled: true'' you can't override it with a merge +# and you can't erase existing hooks or all environment variables. +# However, with "override_config: true" in a particular config.*.yaml file, +# 'nfs_mount_enabled: false' can override the existing values, and +# hooks: +# post_start: [] +# or +# web_environment: [] +# or +# additional_hostnames: [] +# can have their intended affect. 'override_config' affects only behavior of the +# config.*.yaml file it exists in. + # 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 +# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more # information on the commands that can be extended and the tasks you can define # for them. Example: #hooks: