diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ff29294c6..0bd367d526 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Officially support Ubuntu 20.04 (and default Vagrant to it) ([#1197](https://github.com/roots/trellis/pull/1197)) ### 1.6.0: November 5th, 2020 * Remove prestissimo for Composer 2.0 support ([#1247](https://github.com/roots/trellis/pull/1247)) diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 1559a76a89..971ca45ead 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -67,7 +67,9 @@ - name: Validate Ubuntu version debug: msg: | - Trellis is built for Ubuntu 18.04 Bionic as of https://github.com/roots/trellis/pull/992 + Ubuntu 18.04 Bionic is the minimum supported version of Ubuntu in Trellis 1.0+ (as of https://github.com/roots/trellis/pull/992) + + 20.04 Focal is the recommend version for Trellis 1.7+ (as of https://github.com/roots/trellis/pull/1197) Your Ubuntu version is {{ ansible_distribution_version }} {{ ansible_distribution_release }} @@ -77,8 +79,8 @@ Development via Vagrant: `vagrant destroy && vagrant up` - Staging/Production: Create a new server with Ubuntu 18.04 and provision - when: ansible_distribution_release != 'bionic' + Staging/Production: Create a new server with Ubuntu 20.04 and provision + when: ansible_distribution_version is version('18.04', '<') - name: Check whether passlib is needed fail: diff --git a/vagrant.default.yml b/vagrant.default.yml index a41258b078..96361bc6c4 100644 --- a/vagrant.default.yml +++ b/vagrant.default.yml @@ -2,7 +2,7 @@ vagrant_ip: '192.168.50.5' vagrant_cpus: 1 vagrant_memory: 1024 # in MB -vagrant_box: 'bento/ubuntu-18.04' +vagrant_box: 'bento/ubuntu-20.04' vagrant_box_version: '>= 201807.12.0' vagrant_ansible_version: '2.8.0' vagrant_skip_galaxy: false