From 9fb9556d92cc30f2232218358a47d750c731855a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 22 Apr 2021 10:53:03 +0200 Subject: [PATCH] Update ddev config --- .ddev/config.yaml | 64 +++++++++++++++++++----------- .ddev/docker-compose.override.yaml | 2 - 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index df03fe64..d410d873 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -14,23 +14,26 @@ additional_hostnames: - ski-wochenenden - schnee-event additional_fqdns: [] +mariadb_version: "10.2" +mysql_version: "" nfs_mount_enabled: true -provider: default -omit_containers: [dba] -use_dns_when_possible: true -timezone: Europe/Berlin -webimage_extra_packages: [ ssh ] - hooks: post-start: - - exec: "sudo chmod 600 /home/fromme/.ssh/authorized_keys" - - exec: "sudo service ssh start" + - exec: sudo chmod 600 /home/fromme/.ssh/authorized_keys + - exec: sudo service ssh start +omit_containers: [dba] +webimage_extra_packages: [ssh] +use_dns_when_possible: true +timezone: Europe/Berlin +composer_version: "2" +web_environment: + - TYPO3_CONTEXT=Development -# This config.yaml was created with ddev version v1.14.0 -# webimage: drud/ddev-webserver:v1.14.0 -# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.14.0 -# dbaimage: phpmyadmin/phpmyadmin:5 +# 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. # You can update this config.yaml using 'ddev config'. @@ -44,7 +47,7 @@ hooks: # 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" +# 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, @@ -65,10 +68,10 @@ hooks: # 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, +# "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it 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 +# webserver_type: nginx-fpm # or apache-fpm # timezone: Europe/Berlin # This is the timezone used in the containers and by PHP; @@ -76,6 +79,13 @@ hooks: # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones # For example Europe/Dublin or MST7MDT +# 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. +# It can be set to any existing specific composer version. +# After first project 'ddev start' this will not be updated until it changes + # additional_hostnames: # - somename # - someothername @@ -98,7 +108,7 @@ hooks: # These values specify the destination directory for ddev ssh and the # directory in which commands passed into ddev exec are run. -# omit_containers: ["db", dba", "ddev-ssh-agent"] +# omit_containers: [db, dba, ddev-ssh-agent] # Currently only these containers are supported. Some containers can also be # omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit # the "db" container, several standard features of ddev that access the @@ -108,6 +118,9 @@ hooks: # 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. @@ -125,14 +138,14 @@ hooks: # unless explicitly specified. # phpmyadmin_port: "8036" -# phpmyadmin_https_port: "8037{" +# phpmyadmin_https_port: "8037" # The PHPMyAdmin ports can be changed from the default 8036 and 8037 # mailhog_port: "8025" # mailhog_https_port: "8026" # The MailHog ports can be changed from the default 8025 and 8026 -# webimage_extra_packages: [php-yaml, php7.3-ldap] +# 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] @@ -156,17 +169,22 @@ hooks: # 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; +# (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. +# 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" diff --git a/.ddev/docker-compose.override.yaml b/.ddev/docker-compose.override.yaml index f191db1c..010a4b44 100644 --- a/.ddev/docker-compose.override.yaml +++ b/.ddev/docker-compose.override.yaml @@ -2,8 +2,6 @@ version: '3.6' services: web: - environment: - - TYPO3_CONTEXT=Development volumes: - ../public/typo3conf/ext/ep_theme/Resources/Private/Assets:/var/www/html/public/typo3conf/ext/ep_theme/Resources/Private/Assets:consistent ports: