Merge branch 'add-ddev-config' into 'develop'

Add basic ddev configuration

See merge request t3o/typo3.org!165

.ddev/config.yaml

+APIVersion: "1"
+name: typo3.org
+type: typo3
+docroot: html
+php_version: "7.0"
+webimage: drud/nginx-php-fpm-local:20180416_add_node
+dbimage: drud/mariadb-local:v0.9.0
+dbaimage: drud/phpmyadmin:v0.2.0
+router_http_port: "8080"
+router_https_port: "8443"
+additional_hostnames: []
+provider: default
+type: typo3
+hooks:
+  post-start:
+    - exec: "composer install -d /var/www/html"
+    - exec: "rm -rf typo3conf/ext/t3olayout/Build/node_modules"
+    - exec: "npm --prefix typo3conf/ext/t3olayout/Build install"
+    - exec: "npm --prefix typo3conf/ext/t3olayout/Build run-script build"
+    - exec: "../bin/typo3cms install:generatepackagestates"
+    - exec: "../bin/typo3cms install:extensionsetupifpossible"
+
+# Key features of ddev's config.yaml:
+
+# name: <projectname> # Name of the project, automatically provides 
+#   http://projectname.ddev.local and https://projectname.ddev.local
+
+# type: <projecttype>  # drupal6/7/8, backdrop, typo3, wordpress, php
+
+# 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"
+
+# You can delete the webimage, dbimage, dbaimage lines to use the defaults
+# in ddev.
+
+# webimage: <docker_image>  # nginx/php docker image. 
+# dbimage: <docker_image>  # mariadb docker image. 
+# dbaimage: <docker_image>
+
+# router_http_port: <port>  # Port to be used for http (defaults to port 80)
+# router_https_port: <port> # Port for https (defaults to 443)
+
+#additional_hostnames:
+# - somename
+# - someothername
+# would provide http and https URLs for "somename.ddev.local"
+# and "someothername.ddev.local".
+
+# provider: default # Currently either "default" or "pantheon"
+#
+# Many ddev commands can be extended to run tasks after the ddev command is
+# executed.
+# See https://ddev.readthedocs.io/en/latest/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.solr.yaml

+# ddev apache solr recipe file
+#
+# To use this in your own project: Copy this file to your project's .ddev folder,
+# and create the folder path .ddev/solr/conf. Then, copy the solr configuration
+# files for your project to .ddev/solr/conf. E.g., using Drupal Search API Solr, 
+# you would copy the solr-conf/5.x/ contents into .ddev/solr/conf. The configuration
+# files must be present before running `ddev start`.
+
+version: '3'
+
+services:
+  solr: # This is the service name used when running ddev commands accepting the --service flag
+    container_name: ddev-${DDEV_SITENAME}-solr # This is the name of the container. It is recommended to follow the same name convention used in the main docker-compose.yml file.
+    image: solr:5.4
+    restart: always
+    ports:
+      - 8983 # Solr is served from this port inside the container
+    labels:
+    # These labels ensure this service is discoverable by ddev
+      com.ddev.site-name: ${DDEV_SITENAME}
+      com.ddev.approot: $DDEV_APPROOT
+      com.ddev.app-url: $DDEV_URL
+    environment:
+      - VIRTUAL_HOST=$DDEV_HOSTNAME # This defines the host name the service should be accessible from. This will be sitename.ddev.local
+      - HTTP_EXPOSE=8983 # This defines the port the service should be accessible from at sitename.ddev.local
+    volumes:
+      - "./solr:/solr-conf" # This exposes a mount to the host system `.ddev/solr-conf` directory.
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - dev
+      - /solr-conf
+# This links the solr service to the web service defined in the main docker-compose.yml, allowing applications running in the web service to access the solr service at sitename.ddev.local:8983
+  web:
+    links:
+      - solr:$DDEV_HOSTNAME

.ddev/docker-compose.yaml

+version: '3'
+
+services:
+  db:
+    container_name: ddev-${DDEV_SITENAME}-db
+    image: $DDEV_DBIMAGE
+    stop_grace_period: 60s
+    volumes:
+      - "${DDEV_IMPORTDIR}:/db"
+      - "${DDEV_DATADIR}:/var/lib/mysql"
+      - ".:/mnt/ddev_config"
+    restart: "no"
+    user: "$DDEV_UID:$DDEV_GID"
+    ports:
+      - "3306"
+    labels:
+      com.ddev.site-name: ${DDEV_SITENAME}
+      com.ddev.platform: ddev
+      com.ddev.app-type: typo3
+      com.ddev.approot: $DDEV_APPROOT
+      com.ddev.app-url: $DDEV_URL
+  web:
+    container_name: ddev-${DDEV_SITENAME}-web
+    image: $DDEV_WEBIMAGE
+    volumes:
+      - "../:/var/www/html:cached"
+      - ".:/mnt/ddev_config"
+    restart: "no"
+    user: "$DDEV_UID:$DDEV_GID"
+    depends_on:
+      - db
+    links:
+      - db:db
+    # ports is list of exposed *container* ports
+    ports:
+      - "80"
+      - "8025"
+    working_dir: /var/www/html/${DDEV_DOCROOT}
+    environment:
+      - DDEV_URL=$DDEV_URL
+      - DOCROOT=$DDEV_DOCROOT
+      - DDEV_PHP_VERSION=$DDEV_PHP_VERSION
+      - DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE
+      - DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT
+      - DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT
+      - DEPLOY_NAME=local
+      - VIRTUAL_HOST=$DDEV_HOSTNAME
+      # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from <site>.ddev.local:<port>
+      # To expose a container port to a different host port, define the port as hostPort:containerPort
+      - HTTP_EXPOSE=${DDEV_ROUTER_HTTP_PORT}:80,8025
+      # You can optionally expose an HTTPS port option for any ports defined in HTTP_EXPOSE.
+      # To expose an HTTPS port, define the port as securePort:containerPort.
+      - HTTPS_EXPOSE=${DDEV_ROUTER_HTTPS_PORT}:80
+    labels:
+      com.ddev.site-name: ${DDEV_SITENAME}
+      com.ddev.platform: ddev
+      com.ddev.app-type: typo3
+      com.ddev.approot: $DDEV_APPROOT
+      com.ddev.app-url: $DDEV_URL
+  dba:
+    container_name: ddev-${DDEV_SITENAME}-dba
+    image: $DDEV_DBAIMAGE
+    restart: "no"
+    labels:
+      com.ddev.site-name: ${DDEV_SITENAME}
+      com.ddev.platform: ddev
+      com.ddev.app-type: typo3
+      com.ddev.approot: $DDEV_APPROOT
+      com.ddev.app-url: $DDEV_URL
+    depends_on:
+      - db
+    links:
+      - db:db
+    ports:
+      - "80"
+    environment:
+      - PMA_USER=db
+      - PMA_PASSWORD=db
+      - VIRTUAL_HOST=$DDEV_HOSTNAME
+      # HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from <site>.ddev.local:<port>
+      - HTTP_EXPOSE=8036
+networks:
+  default:
+    external:
+      name: ddev_default

.gitignore

@@ -14,3 +14,5 @@ html/typo3conf/l10n
 html/typo3temp/
 html/uploads/
 html/services/api-keys.php
+/auth.json
+/assets/

auth.json.example

+{
+    "http-basic": {
+        "git-t3o.typo3.org": {
+            "username": "gitlabusername",
+            "password": "gitlabpassword"
+        }
+    }
+}

html/typo3conf/AdditionalConfiguration.ddev.php

+<?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.
+ */
+
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern'] = '.*';
+
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default'] = array_merge($GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default'], [
+                    'dbname' => 'db',
+                    'host' => 'db',
+                    'password' => 'db',
+                    'port' => '3306',
+                    'user' => 'db',
+]);
\ No newline at end of file