Merge branch '204-ddev-1-3-0-compatibility' into 'develop'

Resolve "ddev 1.3.0 compatibility"

Closes #204

See merge request !103

.ddev/.gitignore

+#ddev-generated: Automatically generated ddev .gitignore.
+
+/import.yaml
+/docker-compose.yaml
+/db_snapshots

.ddev/config.yaml

-APIVersion: v1.2.0
+APIVersion: v1.3.0
 name: my.typo3.org
 type: typo3
 docroot: html
@@ -22,10 +22,10 @@ hooks:
   - exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
 
 
-# This config.yaml was created with ddev version v1.2.0 
-# webimage: drud/ddev-webserver:v1.2.0
-# dbimage: drud/ddev-dbserver:v1.2.0
-# dbaimage: drud/phpmyadmin:v1.2.0
+# This config.yaml was created with ddev version v1.3.0 
+# webimage: drud/ddev-webserver:v1.3.0
+dbimage: drud/ddev-dbserver:v1.2.0
+# dbaimage: drud/phpmyadmin:v1.3.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'.

.ddev/docker-compose.yaml

-version: '3.6'
-#ddev-generated
-services:
-  db:
-    container_name: ddev-${DDEV_SITENAME}-db
-    image: $DDEV_DBIMAGE
-    stop_grace_period: 60s
-    volumes:
-      - type: "volume"
-        source: mariadb-database
-        target: "/var/lib/mysql"
-        volume:
-          nocopy: true
-      - type: "bind"
-        source: "${DDEV_IMPORTDIR}"
-        target: "/db"
-      - type: "bind"
-        source: "."
-        target: "/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
-    command: "$DDEV_MARIADB_LOCAL_COMMAND"
-  web:
-    container_name: ddev-${DDEV_SITENAME}-web
-    image: $DDEV_WEBIMAGE
-    volumes:
-      - "../:/var/www/html:cached"
-      - ".:/mnt/ddev_config:ro"
-    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_WEBSERVER_TYPE=$DDEV_WEBSERVER_TYPE
-      - 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
-    extra_hosts: ["unneeded:127.0.0.1"]
-  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
-volumes:
-  mariadb-database:
-    name: "${DDEV_SITENAME}-mariadb"
-  

.gitignore

@@ -19,3 +19,4 @@ html/uploads/
 .php_cs.cache
 .ddev/db_snapshots
 .data
+/.ddev/sequelpro.spf