Skip to content

Commit 8cf3b70

Browse files
authored
Merge pull request #14 from programmatordev/2.x
v2.0.0
2 parents 4a6d765 + d44459d commit 8cf3b70

File tree

14 files changed

+183
-275
lines changed

14 files changed

+183
-275
lines changed

.ddev/config.yaml

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,38 @@ omit_containers: [db]
1313
use_dns_when_possible: true
1414
composer_version: "2"
1515
web_environment: []
16+
corepack_enable: false
1617
disable_upload_dirs_warning: true
1718

1819
# Key features of DDEV's config.yaml:
1920

2021
# name: <projectname> # Name of the project, automatically provides
2122
# http://projectname.ddev.site and https://projectname.ddev.site
23+
# If the name is omitted, the project will take the name of the enclosing directory,
24+
# which is useful if you want to have a copy of the project side by side with this one.
2225

23-
# type: <projecttype> # backdrop, craftcms, django4, drupal6/7/8/9/10, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
24-
# See https://ddev.readthedocs.io/en/latest/users/quickstart/ for more
26+
# type: <projecttype> # backdrop, cakephp, craftcms, drupal, drupal6, drupal7, drupal8, drupal9, drupal10, drupal11, generic, laravel, magento, magento2, php, shopware6, silverstripe, symfony, typo3, wordpress
27+
# See https://docs.ddev.com/en/stable/users/quickstart/ for more
2528
# information on the different project types
2629

2730
# docroot: <relative_path> # Relative path to the directory containing index.php.
2831

29-
# php_version: "8.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"
32+
# php_version: "8.3" # PHP version to use, "5.6" through "8.4"
3033

3134
# You can explicitly specify the webimage but this
3235
# is not recommended, as the images are often closely tied to DDEV's' behavior,
3336
# so this can break upgrades.
3437

35-
# webimage: <docker_image> # nginx/php docker image.
38+
# webimage: <docker_image>
39+
# It’s unusual to change this option, and we don’t recommend it without Docker experience and a good reason.
40+
# Typically, this means additions to the existing web image using a .ddev/web-build/Dockerfile.*
3641

3742
# database:
3843
# type: <dbtype> # mysql, mariadb, postgres
39-
# version: <version> # database version, like "10.4" or "8.0"
40-
# MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0
41-
# PostgreSQL versions can be 9-16.
44+
# version: <version> # database version, like "10.11" or "8.0"
45+
# MariaDB versions can be 5.5-10.8, 10.11, 11.4, 11.8
46+
# MySQL versions can be 5.5-8.0, 8.4
47+
# PostgreSQL versions can be 9-17
4248

4349
# router_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
4450
# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)
@@ -48,14 +54,25 @@ disable_upload_dirs_warning: true
4854
# "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,
4955
# as leaving Xdebug enabled all the time is a big performance hit.
5056

51-
# xhprof_enabled: false # Set to true to enable Xhprof and "ddev start" or "ddev restart"
52-
# Note that for most people the commands
53-
# "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
54-
# as leaving Xhprof enabled all the time is a big performance hit.
57+
# xhgui_http_port: "8143"
58+
# xhgui_https_port: "8142"
59+
# The XHGui ports can be changed from the default 8143 and 8142
60+
# Very rarely used
61+
62+
# host_xhgui_port: "8142"
63+
# Can be used to change the host binding port of the XHGui
64+
# application. Rarely used; only when port conflict and
65+
# bind_all_ports is used (normally with router disabled)
5566

56-
# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn
67+
# xhprof_mode: [prepend|xhgui|global]
68+
# Set to "xhgui" to enable XHGui features
69+
# "xhgui" will become default in a future major release
70+
71+
# webserver_type: nginx-fpm, apache-fpm, generic
5772

5873
# timezone: Europe/Berlin
74+
# If timezone is unset, DDEV will attempt to derive it from the host system timezone
75+
# using the $TZ environment variable or the /etc/localtime symlink.
5976
# This is the timezone used in the containers and by PHP;
6077
# it can be set to any valid timezone,
6178
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
@@ -75,16 +92,17 @@ disable_upload_dirs_warning: true
7592
# - preview
7693
# - snapshot
7794
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
78-
# To reinstall Composer after the image was built, run "ddev debug refresh".
95+
# To reinstall Composer after the image was built, run "ddev debug rebuild".
7996

80-
# nodejs_version: "18"
97+
# nodejs_version: "22"
8198
# change from the default system Node.js version to any other version.
82-
# Numeric version numbers can be complete (i.e. 18.15.0) or
83-
# incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with
84-
# other named releases.
85-
# see https://www.npmjs.com/package/n#specifying-nodejs-versions
86-
# Note that you can continue using 'ddev nvm' or nvm inside the web container
87-
# to change the project's installed node version if you need to.
99+
# See https://docs.ddev.com/en/stable/users/configuration/config/#nodejs_version for more information
100+
# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
101+
# Note that using of 'ddev nvm' is discouraged because "nodejs_version" is much easier to use,
102+
# can specify any version, and is more robust than using 'nvm'.
103+
104+
# corepack_enable: false
105+
# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm
88106

89107
# additional_hostnames:
90108
# - somename
@@ -114,7 +132,7 @@ disable_upload_dirs_warning: true
114132

115133
# ddev_version_constraint: ""
116134
# Example:
117-
# ddev_version_constraint: ">= 1.22.4"
135+
# ddev_version_constraint: ">= 1.24.8"
118136
# This will enforce that the running ddev version is within this constraint.
119137
# See https://github.com/Masterminds/semver#checking-version-constraints for
120138
# supported constraint formats
@@ -143,8 +161,8 @@ disable_upload_dirs_warning: true
143161
# - "mutagen": enables Mutagen for this project.
144162
# - "nfs": enables NFS for this project.
145163
#
146-
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs
147-
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen
164+
# See https://docs.ddev.com/en/stable/users/install/performance/#nfs
165+
# See https://docs.ddev.com/en/stable/users/install/performance/#mutagen
148166

149167
# fail_on_hook_fail: False
150168
# Decide whether 'ddev start' should be interrupted by a failing hook
@@ -193,17 +211,17 @@ disable_upload_dirs_warning: true
193211

194212
# ngrok_args: --basic-auth username:pass1234
195213
# Provide extra flags to the "ngrok http" command, see
196-
# https://ngrok.com/docs/ngrok-agent/config or run "ngrok http -h"
214+
# https://ngrok.com/docs/agent/config/v3/#agent-configuration or run "ngrok http -h"
197215

198216
# disable_settings_management: false
199217
# If true, DDEV will not create CMS-specific settings files like
200-
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
218+
# Drupal's settings.php/settings.ddev.php or TYPO3's additional.php
201219
# In this case the user must provide all such settings.
202220

203221
# You can inject environment variables into the web container with:
204222
# web_environment:
205-
# - SOMEENV=somevalue
206-
# - SOMEOTHERENV=someothervalue
223+
# - SOMEENV=somevalue
224+
# - SOMEOTHERENV=someothervalue
207225

208226
# no_project_mount: false
209227
# (Experimental) If true, DDEV will not mount the project into the web container;
@@ -271,7 +289,7 @@ disable_upload_dirs_warning: true
271289
# Many DDEV commands can be extended to run tasks before or after the
272290
# DDEV command is executed, for example "post-start", "post-import-db",
273291
# "pre-composer", "post-composer"
274-
# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
292+
# See https://docs.ddev.com/en/stable/users/extend/custom-commands/ for more
275293
# information on the commands that can be extended and the tasks you can define
276294
# for them. Example:
277295
#hooks:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
php: ['8.1', '8.2', '8.3']
19+
php: ['8.1', '8.2', '8.3', '8.4']
2020

2121
steps:
2222
- name: Checkout code

0 commit comments

Comments
 (0)