Merge branch 'release/6.3.0'

.ddev/commands/host/initialize

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+## Description: import given test data into ddev (database and configurations)
+## Usage: initialize
+## Example: "ddev import-data"
+
+if ! command -v "git-lfs" &> /dev/null
+then
+    echo "COMMAND "git lfs" could not be found"
+    echo "Please install git-lfs support, see: https://git-lfs.github.com/"
+    exit
+fi
+
+git lfs pull
+ddev import-db --src=.project/data/db.sql.gz
+cp .ddev/typo3/AdditionalConfiguration.php .Build/Web/typo3conf/
+ddev typo3cms install:setup

.ddev/commands/web/typo3

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This assumes that the typo3 command will be in the $PATH; if in vendor/bin/ it will be
+
+## Description: Run TYPO3 CLI (typo3) command inside the web container
+## Usage: typo3 [args]
+## Example: "ddev typo3 site:list" or "ddev typo3 list" or "ddev typo3 extension:list"
+## ProjectTypes: typo3
+
+.Build/bin/typo3 "$@"

.ddev/commands/web/typo3cms

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This assumes that the typo3cms command will be in the $PATH; if in vendor/bin/ it will be
+
+## Description: Run TYPO3 Console (typo3cms) command inside the web container
+## Usage: typo3cms [args]
+## Example: "ddev typo3cms cache:flush" or "ddev typo3cms database:export"
+## ProjectTypes: typo3
+
+.Build/bin/typo3cms "$@"

.ddev/config.yaml

@@ -0,0 +1,182 @@
+name: femanager
+type: typo3
+docroot: .Build/Web/
+php_version: "7.4"
+webserver_type: nginx-fpm
+router_http_port: "80"
+router_https_port: "443"
+xdebug_enabled: false
+additional_hostnames: []
+additional_fqdns: []
+mariadb_version: "10.3"
+mysql_version: ""
+use_dns_when_possible: true
+composer_version: "2"
+web_environment: []
+hooks:
+  post-start:
+    - exec: composer install
+    - exec: cp .ddev/typo3/AdditionalConfiguration.php .Build/Web/typo3conf/
+
+# This config.yaml was created with ddev version v1.17.5
+# webimage: drud/ddev-webserver:v1.17.4
+# dbimage: drud/ddev-dbserver-mariadb-10.3:v1.17.3
+# 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'.
+
+# Key features of ddev's config.yaml:
+
+# name: <projectname> # Name of the project, automatically provides
+#   http://projectname.ddev.site and https://projectname.ddev.site
+
+# type: <projecttype>  # drupal6/7/8, backdrop, typo3, wordpress, php
+
+# docroot: <relative_path> # Relative path to the directory containing index.php.
+
+# 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,
+# so this can break upgrades.
+
+# webimage: <docker_image>  # nginx/php docker image.
+# dbimage: <docker_image>  # mariadb docker image.
+# dbaimage: <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
+# "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  # or apache-fpm
+
+# 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
+
+# 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
+# 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: [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
+# database container will be unusable.
+
+# 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
+
+# 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.
+# 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: "8036"
+# 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: [php7.4-tidy, php-bcmath]
+# 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"
+
+# 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 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;
+# the user is responsible for mounting it manually or via a script.
+# This is to enable experimentation with alternate file mounting strategies.
+# For advanced users only!
+
+# 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

.ddev/docker-compose.browser.yaml

@@ -0,0 +1,13 @@
+version: '3.6'
+services:
+  chromedriver:
+    container_name: ddev-${DDEV_SITENAME}-chromedriver
+    image: selenium/standalone-chrome-debug
+    restart: "no"
+    volumes:
+      - /dev/shm:/dev/shm
+    ports:
+      - 4444
+      - "5900:5900"
+    external_links:
+      - "ddev-router:${DDEV_SITENAME}.ddev.site"

.ddev/docker-compose.typo3.yaml

@@ -0,0 +1,15 @@
+version: '3.6'
+services:
+  web:
+    environment:
+      - TYPO3_CONTEXT=Development/DDEV
+      # Variables for first installation
+      - TYPO3_INSTALL_DB_DRIVER=mysql
+      - TYPO3_INSTALL_DB_USER=db
+      - TYPO3_INSTALL_DB_PASSWORD=db
+      - TYPO3_INSTALL_DB_HOST=db
+      - TYPO3_INSTALL_DB_PORT=3306
+      - TYPO3_INSTALL_DB_USE_EXISTING=1
+      - TYPO3_INSTALL_DB_DBNAME=db
+      - TYPO3_INSTALL_SITE_SETUP_TYPE=no
+      - TYPO3_INSTALL_WEB_SERVER_CONFIG=none

.ddev/typo3/AdditionalConfiguration.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * #ddev-generated: Automatically generated TYPO3 AdditionalConfiguration.php file.
+ * ddev manages this file and may delete or overwrite the file unless this comment is removed.
+ * It is recommended that you leave this file alone.
+ */
+
+if (getenv('IS_DDEV_PROJECT') == 'true') {
+    $GLOBALS['TYPO3_CONF_VARS'] = array_replace_recursive(
+        $GLOBALS['TYPO3_CONF_VARS'],
+        [
+            'DB' => [
+                'Connections' => [
+                    'Default' => [
+                        'dbname' => 'db',
+                        'host' => 'db',
+                        'password' => 'db',
+                        'port' => '3306',
+                        'user' => 'db',
+                    ],
+                ],
+            ],
+            // This GFX configuration allows processing by installed ImageMagick 6
+            'GFX' => [
+                'processor' => 'ImageMagick',
+                'processor_path' => '/usr/bin/',
+                'processor_path_lzw' => '/usr/bin/',
+            ],
+            // This mail configuration sends all emails to mailhog
+            'MAIL' => [
+                'transport' => 'smtp',
+                'transport_smtp_server' => 'localhost:1025',
+            ],
+            'SYS' => [
+                'trustedHostsPattern' => '.*.*',
+                'devIPmask' => '*',
+                'displayErrors' => 1,
+            ],
+        ]
+    );
+}

.ddev/typo3/config.yaml

@@ -0,0 +1,20 @@
+base: 'https://femanager.ddev.site/'
+baseVariants: {  }
+errorHandling: {  }
+languages:
+  -
+    title: English
+    enabled: true
+    base: /
+    typo3Language: default
+    locale: en_US.UTF-8
+    iso-639-1: en
+    websiteTitle: ''
+    navigationTitle: ''
+    hreflang: en-US
+    direction: ltr
+    flag: en-us-gb
+    languageId: '0'
+rootPageId: 1
+routes: {  }
+websiteTitle: ''

.env

@@ -18,6 +18,7 @@ MYSQL_ROOT_PASSWORD=root
 MYSQL_DATABASE=typo3
 MYSQL_PASSWORD=app
 MYSQL_USER=app
+MYSQL_HOST=mysql
 
 # TYPO3
 TYPO3_CONTEXT=Development/Docker

.github/workflows/terupload.yaml

@@ -0,0 +1,17 @@
+name: TERUpload
+
+on:
+  push:
+    tags:
+      - "**"
+
+jobs:
+  TERUpload:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v1
+      - uses: tomasnorre/typo3-upload-ter@v2
+        with:
+          api-token: ${{ secrets.TYPO3_API_TOKEN }}