Merge branch 'ddev-0.18.0' into 'develop'

[TASK] Add .ddev configuration for ter development

See merge request t3o/ter!341

.ddev/.gitignore

+solr/mycores/*

.ddev/config.yaml

+APIVersion: v0.18.0
+name: ter
+type: typo3
+docroot: html
+php_version: "7.0"
+router_http_port: "80"
+router_https_port: "443"
+provider: default
+hooks:
+  post-start:
+    - exec: "composer install -d /var/www/html"
+    - 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"
+    - exec: "cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php"

.ddev/docker-compose.environment.yaml

+version: '3'
+
+services:
+  web:
+    environment:
+      - TYPO3_CONTEXT=Development

.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:6.6.2
+    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.
+      - "./solr/configsets:/opt/solr/server/solr/configsets" # ext:solr configsets linking
+      - "./solr/mycores:/opt/solr/server/solr/mycores"
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - t3o
+      - /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'
+#ddev-generated
+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
+    environment:
+      - COLUMNS=$COLUMNS
+      - LINES=$LINES
+
+  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
+      - DDEV_XDEBUG_ENABLED=$DDEV_XDEBUG_ENABLED
+      - DEPLOY_NAME=local
+      - VIRTUAL_HOST=$DDEV_HOSTNAME
+      - COLUMNS=$COLUMNS
+      - LINES=$LINES
+      # 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

.ddev/readme.md

+# ddev 0.18.0
+
+Add a ddev config with a solr container and preconfigured core "t3o". You just need to access "solr:8983" within your ddev web container. The solr can be accessed via http://ter.ddev.local:8983. Ignore the solr error message regarding the core "dev".
+
+## TypoScript setup for the solr container:
+
+```
+plugin.tx_solr.solr.host = solr
+```
+
+## Windows notes
+
+You need to set an environment variable to get it to work within windows:
+
+```
+COMPOSE_CONVERT_WINDOWS_PATHS=1
+```
+
+For git-bash you can use:
+
+```
+export COMPOSE_CONVERT_WINDOWS_PATHS=1
+```
+
+see https://github.com/docker/for-win/issues/1829#issuecomment-376328022
+
+After setting the environment variable and installing ddev/docker on your windows machine you can just type ddev start to setup your working copy.

.ddev/solr/solr.xml

+<solr>
+	<solrcloud>
+		<str name="host">${host:}</str>
+		<int name="hostPort">${jetty.port:8983}</int>
+		<str name="hostContext">${hostContext:solr}</str>
+		<int name="zkClientTimeout">${zkClientTimeout:15000}</int>
+		<bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
+	</solrcloud>
+
+	<shardHandlerFactory name="shardHandlerFactory"
+						 class="HttpShardHandlerFactory">
+		<int name="socketTimeout">${socketTimeout:0}</int>
+		<int name="connTimeout">${connTimeout:0}</int>
+	</shardHandlerFactory>
+</solr>
\ No newline at end of file

.gitlab-ci/deployer/deploy.php

@@ -30,6 +30,7 @@ $exclude = [
     '.gitignore',
     '.htaccess',
     '.git',
+    '.ddev',
     'Readme.rst',
     'Readme.txt',
     'Upgrading.rst',

html/typo3conf/AdditionalConfiguration.ddev.php

+<?php
+/**
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern'] = '.*';
+$GLOBALS['TYPO3_CONF_VARS']['BE']['loginSecurityLevel'] = 'normal';
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname'] = 'db';
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['user'] = 'db';
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['password'] = 'db';
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['host'] = 'db';
+$GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['port'] = '3306';
+$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] = '$P$CZqeoYBTHC0kXKny4tpTvBSzzV5wVY0'; /* joh316 */