Commit 8a5d3463 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch '298-update-ddev-to-1-6' into 'develop'

Resolve "Update DDEV to 1.6"

Closes #298

See merge request !146
parents e8c55ec1 483f17e0
Pipeline #6715 passed with stages
in 2 minutes and 55 seconds
APIVersion: v1.5.2 APIVersion: v1.6.0
name: my.typo3.org name: my.typo3.org
type: typo3 type: typo3
docroot: public docroot: public
php_version: "7.2" php_version: "7.2"
webserver_type: nginx-fpm webserver_type: nginx-fpm
dbimage: drud/ddev-dbserver:v1.6.0-10.1
router_http_port: "80" router_http_port: "80"
router_https_port: "443" router_https_port: "443"
xdebug_enabled: false xdebug_enabled: false
...@@ -11,25 +12,26 @@ additional_hostnames: [] ...@@ -11,25 +12,26 @@ additional_hostnames: []
additional_fqdns: [] additional_fqdns: []
mariadb_version: "10.1" mariadb_version: "10.1"
webcache_enabled: false webcache_enabled: false
nfs_mount_enabled: false
provider: default provider: default
hooks: hooks:
post-start: post-start:
- exec: bash -c "sudo -E apt-get update" - exec: bash -c "sudo -E apt-get update"
- exec: bash -c "sudo -E apt-get install --yes --no-install-recommends apt-utils" - exec: bash -c "sudo -E apt-get install --yes --no-install-recommends apt-utils"
- exec: bash -c "sudo -E apt-get install --yes php7.2-ldap -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" && killall -HUP php-fpm" - exec: bash -c "sudo -E apt-get install --yes php7.2-ldap -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" && killall -HUP php-fpm"
- exec: cp private/typo3conf/AdditionalConfiguration.ddev.php private/typo3conf/AdditionalConfiguration.php - exec: cp private/typo3conf/AdditionalConfiguration.ddev.php private/typo3conf/AdditionalConfiguration.php
- exec: composer install - exec: composer install
- exec: npm --prefix private/typo3conf/ext/t3olayout/Build install - exec: npm --prefix private/typo3conf/ext/t3olayout/Build install
- exec: npm --prefix private/typo3conf/ext/t3olayout/Build run-script build - exec: npm --prefix private/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
# This config.yaml was created with ddev version v1.5.2 # This config.yaml was created with ddev version v1.6.0
# webimage: drud/ddev-webserver:v1.5.2 # webimage: drud/ddev-webserver:v1.6.0
# dbimage: drud/ddev-dbserver:v1.5.2-10.2 # dbimage: drud/ddev-dbserver:v1.6.0-10.1
# dbaimage: drud/phpmyadmin:v1.5.2 # dbaimage: drud/phpmyadmin:v1.6.0
# bgsyncimage: drud/ddev-bgsync:v1.5.2 # bgsyncimage: drud/ddev-bgsync:v1.6.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'.
...@@ -99,4 +101,4 @@ hooks: ...@@ -99,4 +101,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
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