Skip to content

Commit

Permalink
Merge pull request #1197 from roots/ubuntu-20.04
Browse files Browse the repository at this point in the history
Ubuntu 20.04 support
  • Loading branch information
swalkinshaw authored Nov 9, 2020
2 parents fc0aa13 + 6bfb56f commit 2ae8f38
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
8 changes: 5 additions & 3 deletions roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion vagrant.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2ae8f38

Please sign in to comment.