diff --git a/.ddev/config.yaml b/.ddev/config.yaml index cc4dfbcf..3000f1e1 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,4 +1,4 @@ -APIVersion: v1.12.1 +APIVersion: v1.12.2 name: ep-reisen type: typo3 docroot: public @@ -12,4 +12,148 @@ additional_fqdns: [] nfs_mount_enabled: true provider: default use_dns_when_possible: true -timezone: "Europe/Berlin" +timezone: Europe/Berlin + + +# This config.yaml was created with ddev version v1.12.2 +# webimage: drud/ddev-webserver:v1.12.2 +# 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'. + +# Key features of ddev's config.yaml: + +# name: # Name of the project, automatically provides +# http://projectname.ddev.site and https://projectname.ddev.site + +# type: # drupal6/7/8, backdrop, typo3, wordpress, php + +# docroot: # 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", "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, +# so this can break upgrades. + +# webimage: # nginx/php docker image. +# dbimage: # mariadb docker image. +# dbaimage: +# bgsyncimage: + +# 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 to be used for http (defaults to port 80) +# router_https_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 +# would provide http and https URLs for "somename.ddev.site" +# and "someothername.ddev.site". + +# additional_fqdns: +# - example.com +# - sub1.example.com +# would provide http and https URLs for "example.com" and "sub1.example.com" +# 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. + +# 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. + +# 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 +# ~/.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/#webcache + +# host_https_port: "59002" +# The host port binding for https can be explicitly specified. It is +# dynamic unless otherwise specified. +# This is not used by most people, most people use the *router* instead +# of the localhost port. + +# host_webserver_port: "59001" +# The host port binding for the ddev-webserver can be explicitly specified. It is +# dynamic unless otherwise specified. +# This is not used by most people, most people use the *router* instead +# of the localhost port. + +# host_db_port: "59002" +# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic +# unless explicitly specified. + +# phpmyadmin_port: "1000" +# The PHPMyAdmin port can be changed from the default 8036 + +# mailhog_port: "1001" +# The MailHog port can be changed from the default 8025 + +# webimage_extra_packages: [php-yaml, php7.3-ldap] +# Extra Debian packages that are needed in the webimage can be added here + +# dbimage_extra_packages: [telnet,netcat] +# 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 +# instead of editing /etc/hosts +# Defaults to true + +# project_tld: ddev.site +# The top-level domain used for project URLs +# The default "ddev.site" allows DNS lookup via a wildcard +# If you prefer you can change this to "ddev.local" to preserve +# pre-v1.9 behavior. + +# 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" + +# 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", +# "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 +# for them. Example: +#hooks: +# post-start: +# - exec: composer install -d /var/www/html diff --git a/.ddev/docker-compose.yaml b/.ddev/docker-compose.yaml index 24f721a1..8b4fab13 100644 --- a/.ddev/docker-compose.yaml +++ b/.ddev/docker-compose.yaml @@ -5,7 +5,7 @@ services: db: container_name: ddev-${DDEV_SITENAME}-db build: - context: '/Users/fromme/www/ep-reisen-web/.ddev/.dbimageBuild' + context: '/Users/fromme/www/ep-reisen/.ddev/.dbimageBuild' args: BASE_IMAGE: $DDEV_DBIMAGE username: 'fromme' @@ -25,7 +25,7 @@ services: - ddev-global-cache:/mnt/ddev-global-cache restart: "no" user: "$DDEV_UID:$DDEV_GID" - hostname: ep-reisen-web-db + hostname: ep-reisen-db ports: - "127.0.0.1:$DDEV_HOST_DB_PORT:3306" labels: @@ -36,8 +36,8 @@ services: environment: - COLUMNS=$COLUMNS - LINES=$LINES - - TZ= - - DDEV_PROJECT=ep-reisen-web + - TZ=Europe/Berlin + - DDEV_PROJECT=ep-reisen command: "$DDEV_MARIADB_LOCAL_COMMAND" healthcheck: interval: 1s @@ -48,7 +48,7 @@ services: web: container_name: ddev-${DDEV_SITENAME}-web build: - context: '/Users/fromme/www/ep-reisen-web/.ddev/.webimageBuild' + context: '/Users/fromme/www/ep-reisen/.ddev/.webimageBuild' args: BASE_IMAGE: $DDEV_WEBIMAGE username: 'fromme' @@ -73,7 +73,7 @@ services: restart: "no" user: "$DDEV_UID:$DDEV_GID" - hostname: ep-reisen-web-web + hostname: ep-reisen-web links: - db:db @@ -96,7 +96,7 @@ services: - VIRTUAL_HOST=$DDEV_HOSTNAME - COLUMNS=$COLUMNS - LINES=$LINES - - TZ= + - TZ=Europe/Berlin # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: # To expose a container port to a different host port, define the port as hostPort:containerPort - HTTP_EXPOSE=${DDEV_ROUTER_HTTP_PORT}:80,${DDEV_MAILHOG_PORT}:8025 @@ -104,7 +104,7 @@ services: # To expose an HTTPS port, define the port as securePort:containerPort. - HTTPS_EXPOSE=${DDEV_ROUTER_HTTPS_PORT}:80 - SSH_AUTH_SOCK=/home/.ssh-agent/socket - - DDEV_PROJECT=ep-reisen-web + - DDEV_PROJECT=ep-reisen labels: com.ddev.site-name: ${DDEV_SITENAME} com.ddev.platform: ddev @@ -112,7 +112,7 @@ services: com.ddev.approot: $DDEV_APPROOT external_links: - - "ddev-router:ep-reisen-web.ddev.site" + - "ddev-router:ep-reisen.ddev.site" healthcheck: interval: 1s @@ -135,12 +135,12 @@ services: - db:db ports: - "80" - hostname: ep-reisen-web-dba + hostname: ep-reisen-dba environment: - PMA_USER=db - PMA_PASSWORD=db - VIRTUAL_HOST=$DDEV_HOSTNAME - - TZ= + - TZ=Europe/Berlin # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from .ddev.site: - HTTP_EXPOSE=${DDEV_PHPMYADMIN_PORT}:8036 healthcheck: @@ -170,7 +170,7 @@ volumes: driver_opts: type: nfs o: "addr=host.docker.internal,hard,nolock,rw" - device: ":/Users/fromme/www/ep-reisen-web" + device: ":/Users/fromme/www/ep-reisen" \ No newline at end of file