Skip to content

Commit

Permalink
[TASK] Update ddev to 1.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminkott committed Jan 16, 2020
1 parent 65991fa commit e904aa5
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 39 deletions.
19 changes: 0 additions & 19 deletions .ddev/.gitignore

This file was deleted.

46 changes: 26 additions & 20 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APIVersion: v1.10.1
APIVersion: v1.12.1
name: blog
type: typo3
docroot: .build/web
Expand All @@ -16,11 +16,11 @@ use_dns_when_possible: true
timezone: ""


# This config.yaml was created with ddev version v1.10.1
# webimage: drud/ddev-webserver:v1.10.0
# dbimage: drud/ddev-dbserver:v1.10.0-10.2
# dbaimage: drud/phpmyadmin:v1.10.0
# bgsyncimage: drud/ddev-bgsync:v1.10.0
# This config.yaml was created with ddev version v1.12.1
# webimage: drud/ddev-webserver:v1.12.1
# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.12.0
# dbaimage: drud/phpmyadmin:v1.12.0
# bgsyncimage: drud/ddev-bgsync:v1.12.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'.
Expand All @@ -34,7 +34,7 @@ timezone: ""

# 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
# is not recommended, as the images are often closely tied to ddev's' behavior,
Expand All @@ -45,19 +45,25 @@ timezone: ""
# dbaimage: <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_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
# 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,
# 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

Expand All @@ -79,23 +85,23 @@ timezone: ""
# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: ["dba", "ddev-ssh-agent"]
# would omit the dba (phpMyAdmin) and ddev-ssh-agent containers. Currently
# 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.

# nfs_mount_enabled: false
# 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

# webcache_enabled: false (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
# Was only for macOS, but now deprecated.
# See https://ddev.readthedocs.io/en/stable/users/performance/#webcache

# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
Expand Down Expand Up @@ -126,8 +132,8 @@ timezone: ""
# Extra Debian packages that are needed in the dbimage can be added here

# use_dns_when_possible: true
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts
# Defaults to true

Expand All @@ -138,13 +144,13 @@ timezone: ""
# pre-v1.9 behavior.

# 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"

# provider: default # Currently either "default" or "pantheon"
#
# Many ddev commands can be extended to run tasks before or after the
# ddev command is executed, for example "post-start", "post-import-db",
# 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
# information on the commands that can be extended and the tasks you can define
Expand Down

0 comments on commit e904aa5

Please sign in to comment.