Commit b6ae5a34 authored by Thomas Löffler's avatar Thomas Löffler

Update ddev to 1.10.2

parent a183f929
#ddev-generated: Automatically generated ddev .gitignore.
# You can remove the above line if you want to edit and maintain this file yourself.
/commands/*/*.example
/commands/*/README.txt
/commands/db/mysql
/homeadditions/*.example
/homeadditions/README.txt
/import.yaml
/docker-compose.yaml
/db_snapshots
......@@ -8,6 +13,10 @@
/import-db
/.bgsync*
/config.*.y*ml
/.webimageBuild
/.dbimageBuild
/.bgsyncimageBuild
/.sshimageBuild
/.webimageExtra
/.dbimageExtra
/*-build/Dockerfile.example
APIVersion: v1.9.1
APIVersion: v1.10.2
name: ter
type: typo3
docroot: public
......@@ -25,11 +25,11 @@ use_dns_when_possible: true
timezone: Europe/Berlin
# 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.2
# webimage: drud/ddev-webserver:v1.10.2
# 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'.
......@@ -43,7 +43,7 @@ timezone: Europe/Berlin
# docroot: <relative_path> # 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,
......@@ -58,9 +58,18 @@ timezone: Europe/Berlin
# 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"
# 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
......@@ -121,11 +130,9 @@ timezone: Europe/Berlin
# 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
......@@ -136,9 +143,10 @@ timezone: Europe/Berlin
# 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"
......@@ -152,4 +160,4 @@ timezone: Europe/Berlin
# for them. Example:
#hooks:
# post-start:
# - exec: composer install -d /var/www/html
\ No newline at end of file
# - exec: composer install -d /var/www/html
......@@ -3,6 +3,4 @@ version: '3.6'
services:
web:
environment:
- TYPO3_CONTEXT=Development
- PHP_IDE_CONFIG="serverName=ter.ddev.local"
- DEBIAN_FRONTEND=noninteractive
\ No newline at end of file
- TYPO3_CONTEXT=Development
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment