Commit 9805aa3c authored by Andreas Nedbal's avatar Andreas Nedbal
Browse files

Merge branch 'task/update-ddev-1-2-0' into 'develop'

Update ddev to 1.2.0

See merge request !96
parents 1e00e463 52237df4
Pipeline #5236 passed with stages
in 6 minutes and 23 seconds
APIVersion: v1.0.0
APIVersion: v1.2.0
name: my.typo3.org
type: typo3
docroot: html
php_version: "7.0"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
......@@ -21,10 +22,10 @@ hooks:
- exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
# This config.yaml was created with ddev version v1.0.0
# webimage: drud/ddev-webserver:v1.0.0
# dbimage: drud/ddev-dbserver:v1.0.0
# dbaimage: drud/phpmyadmin:v1.0.0
# 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
# 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'.
......@@ -53,18 +54,23 @@ hooks:
# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
#additional_hostnames:
# - somename
# - someothername
# webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well
# additional_hostnames:
# - somename
# - someothername
# would provide http and https URLs for "somename.ddev.local"
# and "someothername.ddev.local".
#additional_fqdns:
# - example.com
# - sub1.example.com
# 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.
# provider: default # Currently either "default" or "pantheon"
#
# Many ddev commands can be extended to run tasks after the ddev command is
......@@ -74,4 +80,4 @@ hooks:
# for them. Example:
#hooks:
# post-start:
# - exec: "composer install -d /var/www/html"
# - exec: composer install -d /var/www/html
\ No newline at end of file
version: '3'
version: '3.6'
services:
web:
environment:
- TYPO3_CONTEXT=Development
\ No newline at end of file
- TYPO3_CONTEXT=Development
version: '3'
version: '3.6'
#ddev-generated
services:
db:
......@@ -6,9 +6,17 @@ services:
image: $DDEV_DBIMAGE
stop_grace_period: 60s
volumes:
- "${DDEV_IMPORTDIR}:/db"
- "${DDEV_DATADIR}:/var/lib/mysql"
- ".:/mnt/ddev_config"
- 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:
......@@ -22,13 +30,13 @@ services:
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"
- ".:/mnt/ddev_config:ro"
restart: "no"
user: "$DDEV_UID:$DDEV_GID"
depends_on:
......@@ -44,6 +52,7 @@ services:
- 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
......@@ -91,3 +100,7 @@ networks:
default:
external:
name: ddev_default
volumes:
mariadb-database:
name: "${DDEV_SITENAME}-mariadb"
......@@ -17,3 +17,5 @@ html/uploads/
/auth.json
/html/typo3conf/realurl_autoconf.php
.php_cs.cache
.ddev/db_snapshots
.data
#ddev-generated: Automatically generated ddev .gitignore.
/AdditionalConfiguration.php
/ddev_drush_settings.php
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment