Skip to content

Commit

Permalink
Update to Drupal VM 3.4.x with Selenium and Chromedriver. (#549)
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy authored and grasmash committed Oct 12, 2016
1 parent 25cfe7a commit df47a74
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 23 deletions.
2 changes: 1 addition & 1 deletion phing/tasks/vm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<copy file="${blt.root}/scripts/drupal-vm/Vagrantfile" todir="${repo.root}" verbose="true"/>

<echo>Adding geerlingguy/drupal-vm to composer dev dependencies.</echo>
<exec dir="${repo.root}" command="composer require --dev geerlingguy/drupal-vm:~3.3" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
<exec dir="${repo.root}" command="composer require --dev geerlingguy/drupal-vm:~3.4" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>

<echo></echo>
<echo>A new "box" directory and a Vagrantfile have been added to ${repo.root}</echo>
Expand Down
47 changes: 25 additions & 22 deletions scripts/drupal-vm/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,33 +50,36 @@ installed_extras:

# Use PHP 5.6 and change package names to work with 5.6.
php_version: "5.6"
php_install_recommends: no
php_packages:
- php5
- php5-apcu
- php5-mcrypt
- php5-cli
- php5-common
- php5-curl
- php5-dev
- php5-fpm
- php5-gd
- php5-sqlite
- php5.6
- php5.6-apcu
- php5.6-mcrypt
- php5.6-cli
- php5.6-common
- php5.6-curl
- php5.6-dev
- php5.6-fpm
- php5.6-gd
- php5.6-sqlite3
- php5.6-xml
- php5.6-mbstring
- php-pear
- libpcre3-dev
php_conf_paths:
- /etc/php5/fpm
- /etc/php5/apache2
- /etc/php5/cli
- /etc/php/5.6/fpm
- /etc/php/5.6/apache2
- /etc/php/5.6/cli
php_extension_conf_paths:
- /etc/php5/fpm/conf.d
- /etc/php5/apache2/conf.d
- /etc/php5/cli/conf.d
php_fpm_daemon: php5-fpm
php_fpm_conf_path: "/etc/php5/fpm"
php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
php_mysql_package: php5-mysql
php_redis_package: php5-redis
php_memcached_package: php5-memcached
- /etc/php/5.6/fpm/conf.d
- /etc/php/5.6/apache2/conf.d
- /etc/php/5.6/cli/conf.d
php_fpm_daemon: php5.6-fpm
php_fpm_conf_path: "/etc/php/5.6/fpm"
php_fpm_pool_conf_path: "/etc/php/5.6/fpm/pool.d/www.conf"
php_mysql_package: php5.6-mysql
php_redis_package: php5.6-redis
php_memcached_package: php5.6-memcached

# Use PHP 5.6-compatible version of XHProf.
xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz
Expand Down

0 comments on commit df47a74

Please sign in to comment.