Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit a8cb9c8

Browse files
committed
Fixes #2065: Drop official support for Debian 9, CentOS 7, and Ubuntu 16.04.
1 parent ee1ac2d commit a8cb9c8

File tree

9 files changed

+13
-53
lines changed

9 files changed

+13
-53
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ env:
2020
# Defaults - Ubuntu 18.04.
2121
- type: defaults
2222
distro: ubuntu1804
23-
# Defaults - Debian 9.
23+
# Defaults - Debian 10.
2424
- type: debian
25-
distro: debian9
25+
distro: debian10
2626
ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
27-
# Defaults - CentOS 7.
27+
# Defaults - CentOS 8.
2828
- type: centos
29-
distro: centos7
30-
local_config: tests/centos-7.config.yml
29+
distro: centos8
30+
local_config: tests/centos-8.config.yml
3131
ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python
3232

3333
# PHP 7.3 - Ubuntu 18.04.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Notes:
8080

8181
- **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.*
8282
- **For stability**: Because every version of VirtualBox introduces changes to networking, for the best stability, you should install Vagrant's `vbguest` plugin: `vagrant plugin install vagrant-vbguest`.
83-
- **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).*
83+
- **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See [nfs instructions for Linux](http://docs.drupalvm.com/en/latest/getting-started/installation-linux/#mounting-nfs-shared-folders-hangs)*
8484
- **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of 2020, Drupal VM recommends: Vagrant 2.2.x, VirtualBox 6.1.x, and Ansible 2.9.x*
8585

8686
### 2 - Build the Virtual Machine

default.config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
# Available `vagrant_box` values include:
33
# - geerlingguy/drupal-vm (pre-provisioned, based on Ubuntu 18.04)
44
# - geerlingguy/centos8
5-
# - geerlingguy/centos7
65
# - geerlingguy/debian10
7-
# - geerlingguy/debian9
86
# - geerlingguy/ubuntu1804
9-
# - geerlingguy/ubuntu1604
107
vagrant_box: geerlingguy/drupal-vm
118

129
vagrant_user: vagrant

docs/configurations/base-os.md

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,24 @@ Drupal VM's configuration is designed to work with RedHat and Debian-compatible
33
Currently-supported OSes are:
44

55
- Ubuntu 18.04 'Bionic' (default)
6-
- Ubuntu 16.04 'Xenial'
76
- RedHat Enterprise Linux / CentOS 8
8-
- RedHat Enterprise Linux / CentOS 7
97
- Debian 10 'Buster'
10-
- Debian 9 'Stretch'
118

129
For certain OSes, there are a couple other caveats and tweaks you may need to perform to get things running smoothly—the main features and latest development is only guaranteed to work with the default OS as configured in `default.config.yml`.
1310

14-
Some other OSes should work, but are not regularly tested with Drupal VM, including Debian 8/Jessie (`debian/jessie64`).
11+
Some other OSes may work, but are not regularly tested with Drupal VM, and may require extra work to make everything work, depending on the version of Drupal you're using.
1512

1613
## Ubuntu 18.04 Bionic LTS
1714

1815
Everything should work out of the box with Ubuntu 18.04.
1916

20-
## Ubuntu 16.04 Xenial LTS
21-
22-
Most everything should work out of the box with Ubuntu 16.04. You will need to override one variable in your `config.yml` to use an older version of Python when provisioning:
23-
24-
ansible_python_interpreter: /usr/bin/python
25-
2617
## RedHat Enterprise Linux / CentOS 8
2718

2819
Everything should work out of the box with RHEL 8.
2920

30-
## RedHat Enterprise Linux / CentOS 7
31-
32-
Most everything should work out of the box with CentOS 7. You will need to override one variable in your `config.yml` to use an older version of Python when provisioning:
33-
34-
ansible_python_interpreter: /usr/bin/python
35-
3621
## Debian 10 Buster
3722

3823
Most everything should work out of the box with Debian 10. If you are installing `java` or `solr` in the `installed_extras`, you need to override the `java_packages` in your `config.yml`:
3924

4025
java_packages:
4126
- openjdk-11-jdk
42-
43-
## Debian 9 Stretch
44-
45-
Everything should work out of the box with Debian 9.

docs/configurations/databases-mariadb.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ mysql_packages:
99
- python-mysqldb
1010
```
1111
12-
This set of packages works out of the box with Ubuntu 16.04 as well as the default Ubuntu 18.04 installation that comes with Drupal VM.
12+
This set of packages works out of the box with Ubuntu 18.04 installation that comes with Drupal VM.
1313
14-
Alternatively, if you want to use RedHat 7 or CentOS 7 instead of Ubuntu, you can set the following variables to install and configure MariaDB instead of MySQL:
14+
Alternatively, if you want to use RedHat 8 or CentOS 8 instead of Ubuntu, you can set the following variables to install and configure MariaDB instead of MySQL:
1515
1616
```yaml
1717
mysql_packages:

docs/configurations/php.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ If you're using Apache with `mod_php` you should also add `libapache2-mod-php{{
88

99
_Note: XHProf does currently not work with PHP 7.1+, make sure you don't have it listed in `installed_extras`._
1010

11-
## RedHat/CentOS 7 or 8
11+
## RedHat/CentOS 8
1212

1313
Remi's RPM repository is included with Drupal VM, and you can make the following changes to use it to install a different version of PHP than 7.4:
1414

15-
1. Make sure you've followed the directions for switching to CentOS 7 in the [use a different base OS](base-os.md) guide.
15+
1. Make sure you've followed the directions for switching to CentOS 8 in the [use a different base OS](base-os.md) guide.
1616
2. Change `php_version` inside `config.yml` to `"7.2"` or `"7.3"`.
1717

1818
## PHP 5.6 EOL

docs/other/production.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,6 @@ After a few minutes, your Drupal-VM-in-the-cloud Droplet should be fully configu
162162
163163
### Go Further
164164
165-
You can use Ubuntu Ubuntu 18.04, Ubuntu 16.04, Debian 9, or CentOS 7 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
165+
You can use Ubuntu Ubuntu 18.04, Debian 10, or CentOS 8 when you build the DigitalOcean Droplet. Just like with Drupal VM running locally, you can customize almost every aspect of the server!
166166
167167
You may want to customize your configuration even further, to make sure Drupal VM is tuned for your specific Drupal site's needs, or you may want to change things and make the server configuration more flexible, etc. For all that, the book [Ansible for DevOps](http://ansiblefordevops.com/) will give you a great introduction to using Ansible to make Drupal VM and the included Ansible configuration do exactly what you need!

docs/other/vagrant-lxc.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ Read more about how to configure the container in [`vagrant-lxc`'s README.md](ht
2727

2828
The following boxes have been tested only minimally, choose which one you want.
2929

30-
# Centos 7
31-
vagrant_box: frensjan/centos-7-64-lxc
32-
33-
# Ubuntu 16.04
34-
vagrant_box: nhinds/xenial64
35-
3630
# Do not interact with the UFW service on Ubuntu.
3731
drupalvm_disable_ufw_firewall: false
3832

tests/run-tests.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,18 @@ tag="${tag:-latest}"
2020
cleanup="${cleanup:-true}"
2121

2222
## Set up vars for Docker setup.
23-
# CentOS 7
24-
if [ $distro = 'centos7' ]; then
25-
init="/usr/lib/systemd/systemd"
26-
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
2723
# CentOS 8
28-
elif [ $distro = 'centos8' ]; then
24+
if [ $distro = 'centos8' ]; then
2925
init="/usr/lib/systemd/systemd"
3026
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
3127
# Ubuntu 18.04
3228
elif [ $distro = 'ubuntu1804' ]; then
3329
init="/lib/systemd/systemd"
3430
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
35-
# Ubuntu 16.04
36-
elif [ $distro = 'ubuntu1604' ]; then
37-
init="/lib/systemd/systemd"
38-
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
3931
# Debian 10
4032
elif [ $distro = 'debian10' ]; then
4133
init="/lib/systemd/systemd"
4234
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
43-
# Debian 9
44-
elif [ $distro = 'debian9' ]; then
45-
init="/lib/systemd/systemd"
46-
opts="--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
4735
fi
4836

4937
# Set OS-specific options.

0 commit comments

Comments
 (0)