Commit 2d745a49 authored by Andreas Nedbal's avatar Andreas Nedbal

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

Update ddev to 1.2.0

See merge request !368
parents 5e5468d6 be56d328
Pipeline #5233 passed with stages
in 7 minutes and 59 seconds
solr/mycores/* solr/mycores/*
sequelpro.spf
db_snapshots
APIVersion: v0.20.0 APIVersion: v1.2.0
name: ter name: ter
type: typo3 type: typo3
docroot: html docroot: html
php_version: "7.0" php_version: "7.0"
webserver_type: nginx-fpm
router_http_port: "80" router_http_port: "80"
router_https_port: "443" router_https_port: "443"
xdebug_enabled: false xdebug_enabled: false
additional_hostnames: [] additional_hostnames: []
additional_fqdns: []
provider: default provider: default
hooks: hooks:
post-start: post-start:
- exec: sudo apt-get update - exec: sudo apt-get update
- exec: sudo apt-get install php7.0-ldap - exec: sudo apt-get install php7.0-ldap -y
- exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php
- exec: composer install -d /var/www/html - exec: composer install -d /var/www/html
- exec: npm --prefix typo3conf/ext/t3olayout/Build install - exec: npm --prefix typo3conf/ext/t3olayout/Build install
- exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build - exec: npm --prefix typo3conf/ext/t3olayout/Build run-script build
- exec: ../vendor/bin/typo3cms install:generatepackagestates - exec: ../vendor/bin/typo3cms install:generatepackagestates
- exec: ../vendor/bin/typo3cms install:extensionsetupifpossible - exec: ../vendor/bin/typo3cms install:extensionsetupifpossible
- exec: cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php
# This config.yaml was created with ddev version v0.20.0 # This config.yaml was created with ddev version v1.2.0
# webimage: drud/nginx-php-fpm-local:v0.20.0 # webimage: drud/ddev-webserver:v1.2.0
# dbimage: drud/mariadb-local:v0.20.0 # dbimage: drud/ddev-dbserver:v1.2.0
# dbaimage: drud/phpmyadmin:v0.20.0 # dbaimage: drud/phpmyadmin:v1.2.0
# However we do not recommend explicitly wiring these images into the # However we do not recommend explicitly wiring these images into the
# config.yaml as they may break future versions of ddev. # config.yaml as they may break future versions of ddev.
# You can update this config.yaml using 'ddev config'. # You can update this config.yaml using 'ddev config'.
...@@ -52,12 +54,23 @@ hooks: ...@@ -52,12 +54,23 @@ hooks:
# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart" # xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
#additional_hostnames: # webserver_type: nginx-fpm # Can be set to apache-fpm or apache-cgi as well
# - somename
# - someothername # additional_hostnames:
# - somename
# - someothername
# would provide http and https URLs for "somename.ddev.local" # would provide http and https URLs for "somename.ddev.local"
# and "someothername.ddev.local". # and "someothername.ddev.local".
# 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" # provider: default # Currently either "default" or "pantheon"
# #
# Many ddev commands can be extended to run tasks after the ddev command is # Many ddev commands can be extended to run tasks after the ddev command is
...@@ -67,4 +80,4 @@ hooks: ...@@ -67,4 +80,4 @@ hooks:
# for them. Example: # for them. Example:
#hooks: #hooks:
# post-start: # 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: services:
web: web:
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# you would copy the solr-conf/5.x/ contents into .ddev/solr/conf. The configuration # you would copy the solr-conf/5.x/ contents into .ddev/solr/conf. The configuration
# files must be present before running `ddev start`. # files must be present before running `ddev start`.
version: '3' version: '3.6'
services: services:
solr: # This is the service name used when running ddev commands accepting the --service flag solr: # This is the service name used when running ddev commands accepting the --service flag
......
version: '3' version: '3.6'
#ddev-generated #ddev-generated
services: services:
db: db:
...@@ -6,9 +6,17 @@ services: ...@@ -6,9 +6,17 @@ services:
image: $DDEV_DBIMAGE image: $DDEV_DBIMAGE
stop_grace_period: 60s stop_grace_period: 60s
volumes: volumes:
- "${DDEV_IMPORTDIR}:/db" - type: "volume"
- "${DDEV_DATADIR}:/var/lib/mysql" source: mariadb-database
- ".:/mnt/ddev_config" target: "/var/lib/mysql"
volume:
nocopy: true
- type: "bind"
source: "${DDEV_IMPORTDIR}"
target: "/db"
- type: "bind"
source: "."
target: "/mnt/ddev_config"
restart: "no" restart: "no"
user: "$DDEV_UID:$DDEV_GID" user: "$DDEV_UID:$DDEV_GID"
ports: ports:
...@@ -22,13 +30,13 @@ services: ...@@ -22,13 +30,13 @@ services:
environment: environment:
- COLUMNS=$COLUMNS - COLUMNS=$COLUMNS
- LINES=$LINES - LINES=$LINES
command: "$DDEV_MARIADB_LOCAL_COMMAND"
web: web:
container_name: ddev-${DDEV_SITENAME}-web container_name: ddev-${DDEV_SITENAME}-web
image: $DDEV_WEBIMAGE image: $DDEV_WEBIMAGE
volumes: volumes:
- "../:/var/www/html:cached" - "../:/var/www/html:cached"
- ".:/mnt/ddev_config" - ".:/mnt/ddev_config:ro"
restart: "no" restart: "no"
user: "$DDEV_UID:$DDEV_GID" user: "$DDEV_UID:$DDEV_GID"
depends_on: depends_on:
...@@ -44,6 +52,7 @@ services: ...@@ -44,6 +52,7 @@ services:
- DDEV_URL=$DDEV_URL - DDEV_URL=$DDEV_URL
- DOCROOT=$DDEV_DOCROOT - DOCROOT=$DDEV_DOCROOT
- DDEV_PHP_VERSION=$DDEV_PHP_VERSION - DDEV_PHP_VERSION=$DDEV_PHP_VERSION
- DDEV_WEBSERVER_TYPE=$DDEV_WEBSERVER_TYPE
- DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE - DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE
- DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT - DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT
- DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT - DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT
...@@ -91,3 +100,7 @@ networks: ...@@ -91,3 +100,7 @@ networks:
default: default:
external: external:
name: ddev_default name: ddev_default
volumes:
mariadb-database:
name: "${DDEV_SITENAME}-mariadb"
Markdown is supported
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