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

Commit 279934a

Browse files
committed
Fixes #2050: Default to Drupal 9.
1 parent 1ae7c38 commit 279934a

File tree

11 files changed

+21
-21
lines changed

11 files changed

+21
-21
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM geerlingguy/docker-debian9-ansible:latest
1+
FROM geerlingguy/docker-debian10-ansible:latest
22
LABEL maintainer="Jeff Geerling"
33

44
# Copy provisioning directory, variable overrides, and scripts into container.
@@ -8,7 +8,7 @@ COPY ./provisioning/docker/bin/* /usr/local/bin
88

99
# Provision Drupal VM inside Docker.
1010
RUN ansible-playbook /etc/ansible/drupal-vm/provisioning/playbook.yml \
11-
-e "ansible_python_interpreter=/usr/bin/python" \
11+
-e "ansible_python_interpreter=/usr/bin/python3" \
1212
# Enable FPM. See https://github.com/geerlingguy/drupal-vm/issues/1366.
1313
&& systemctl enable php7.2-fpm.service
1414

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Drupal VM installs the following on an Ubuntu 18.04 (by default) linux VM:
1818
- Apache (or Nginx)
1919
- PHP (configurable version)
2020
- MySQL (or MariaDB, or PostgreSQL)
21-
- Drupal 7 or 8
21+
- Drupal 7, 8, or 9
2222
- Optional:
2323
- Drupal Console
2424
- Drush
@@ -52,17 +52,17 @@ There are a couple places where you can customize the VM for your needs:
5252
- `config.yml`: Override any of the default VM configuration from `default.config.yml`; customize almost any aspect of any software installed in the VM (more about [configuring Drupal VM](http://docs.drupalvm.com/en/latest/getting-started/configure-drupalvm/).
5353
- `drupal.composer.json` or `drupal.make.yml`: Contains configuration for the Drupal core version, modules, and patches that will be downloaded on Drupal's initial installation (you can build using Composer, Drush make, or your own codebase).
5454

55-
If you want to switch from Drupal 8 (default) to Drupal 7 on the initial install, do the following:
55+
If you want to use Drupal 7 on the initial install, do the following:
5656

5757
1. Switch to using a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/).
5858
1. Update the Drupal `version` and `core` inside your `drupal.make.yml` file.
5959
2. Set `drupal_major_version: 7` inside `config.yml`.
6060

6161
## Quick Start Guide
6262

63-
This Quick Start Guide will help you quickly build a Drupal 8 site on the Drupal VM using Composer with `drupal-project`. You can also use Drupal VM with [Composer](http://docs.drupalvm.com/en/latest/deployment/composer/), a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/), with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/), or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
63+
This Quick Start Guide will help you quickly build a Drupal 9 site on the Drupal VM creating a new Composer project. You can also use Drupal VM with [Composer](http://docs.drupalvm.com/en/latest/deployment/composer/), a [Drush Make file](http://docs.drupalvm.com/en/latest/deployment/drush-make/), with a [Local Drupal codebase](http://docs.drupalvm.com/en/latest/deployment/local-codebase/), or even a [Drupal multisite installation](http://docs.drupalvm.com/en/latest/deployment/multisite/).
6464

65-
If you want to install a Drupal 8 site locally with minimal fuss, just:
65+
If you want to install a Drupal site locally with minimal fuss, just:
6666

6767
1. Install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
6868
2. Download or clone this project to your workstation.
@@ -81,7 +81,7 @@ Notes:
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`.
8383
- **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).*
84-
- **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of early 2019, Drupal VM recommends: Vagrant 2.2.x, VirtualBox 6.0.x, and Ansible 2.7.x*
84+
- **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
8787

@@ -141,7 +141,7 @@ Drupal VM follows semantic versioning, which means your configuration should con
141141
2. Do a diff of your `config.yml` with the updated `default.config.yml` (e.g. `curl https://raw.githubusercontent.com/geerlingguy/drupal-vm/master/default.config.yml | git diff --no-index config.yml -`).
142142
3. Run `vagrant provision` to provision the VM, incorporating all the latest changes.
143143

144-
For major version upgrades (e.g. 3.x.x to 4.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
144+
For major version upgrades (e.g. 4.x.x to 5.x.x), it may be simpler to destroy the VM (`vagrant destroy`) then build a fresh new VM (`vagrant up`) using the new version of Drupal VM.
145145

146146
## System Requirements
147147

default.config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ drupal_composer_dependencies:
7777
# Set this to 'true' and 'drupal_build_makefile', 'drupal_build_composer' to 'false'
7878
# if you are using Composer's create-project as a site deployment strategy.
7979
drupal_build_composer_project: true
80-
drupal_composer_project_package: "drupal-composer/drupal-project:8.x-dev"
80+
drupal_composer_project_package: "drupal/recommended-project:^9@dev"
8181
drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
8282

8383
# Set this to 'false' if you don't need to install drupal (using the drupal_*
@@ -93,7 +93,7 @@ drupal_db_name: drupal
9393
drupal_db_host: localhost
9494

9595
# Settings for installing a Drupal site if 'drupal_install_site:' is 'true'.
96-
drupal_major_version: 8
96+
drupal_major_version: 9
9797
drupal_domain: "{{ vagrant_hostname }}"
9898
drupal_site_name: "Drupal"
9999
drupal_install_profile: standard

docs/configurations/base-os.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ Most everything should work out of the box with Debian 10. If you are installing
4242

4343
## Debian 9 Stretch
4444

45-
Everything should work out of the box with Debian 10.
45+
Everything should work out of the box with Debian 9.

docs/deployment/composer-package.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Out of the box Drupal VM is configured to use `composer create-project` to build a Drupal 8 codebase.
1+
Out of the box Drupal VM is configured to use `composer create-project` to build a Drupal codebase.
22

33
This is set up with the following variables in `config.yml`:
44

@@ -10,7 +10,7 @@ This is set up with the following variables in `config.yml`:
1010
With [acquia/lightning-project](https://github.com/acquia/lightning-project) as an example your `config.yml` settings would be:
1111

1212
```yaml
13-
drupal_composer_project_package: "acquia/lightning-project:^8.1.0"
13+
drupal_composer_project_package: "acquia/lightning-project:^8.8.1"
1414
drupal_composer_project_options: "--prefer-dist --stability rc --no-interaction"
1515
drupal_core_path: "{{ drupal_composer_install_dir }}/docroot"
1616
```

docs/deployment/drush-make.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ If you want to build a Drupal site using a [Drush make file](http://www.drush.or
99
```yaml
1010
drush_launcher_install: no
1111
drush_install_from_source: yes
12-
drush_source_install_version: "8.1.15"
12+
drush_source_install_version: "8.9.1"
1313
```
1414
1515
Have a look at the defaults in `default.config.yml` and tweak the settings as you'd like in your `config.yml`, then run `vagrant up` as in the Quick Start Guide. Within a few minutes, you should have your site running and available at the `drupal_domain` configured in `config.yml`, falling back to the default `http://drupalvm.test` set in `default.config.yml`.

docs/extras/varnish.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
To enable Varnish, make sure `varnish` is in the list of your `installed_extras` in `config.yml`, and run `vagrant provision`.
44

5-
There are a few varnish configuration variables further down in `default.config.yml` that you may wish to configure. You can use your own `.vcl` file template (instead of the generic Drupal 7-focused generic one) by editing the `varnish_default_vcl_template_path`, and you can use a different port for Varnish by changing `varnish_listen_port`.
5+
There are a few varnish configuration variables further down in `default.config.yml` that you may wish to configure. You can use your own `.vcl` file template (instead of the default generic Drupal-focused one) by editing the `varnish_default_vcl_template_path`, and you can use a different port for Varnish by changing `varnish_listen_port`.
66

77
If you'd like to use Varnish on port 80, and switch Apache to a different backend port, you can do so pretty easily; just make sure you have the following values set in your `config.yml` file, and run `vagrant provision` to have Ansible make the necessary changes:
88

docs/getting-started/configure-drupalvm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Drupal VM's default configurations which you should not edit directly.
1313
The main configuration file of a project. Commonly this is a copy of `default.config.yml` with the values tweaked to your own project. For an easier upgrade path you would only set the values you are actually overriding.
1414

1515
```yaml
16-
vagrant_box: geerlingguy/centos7
17-
vagrant_hostname: my-custom-site.dev
16+
vagrant_box: geerlingguy/centos8
17+
vagrant_hostname: my-custom-site.test
1818
vagrant_machine_name: my_custom_site
1919

2020
php_version: "7.2"

docs/other/docker.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can also add other subdomains if you're using other built-in services, e.g.
2828
If you just want a quick, easy Drupal site for testing, you can run an instance of Drupal VM and install Drupal inside using the provided script.
2929

3030
1. Run an instance of Drupal VM: `docker run -d -v /sys/fs/cgroup:/sys/fs/cgroup:ro -p 80:80 -p 443:443 --name=drupalvm --privileged geerlingguy/drupal-vm`
31-
2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `8.x-dev` or `7.x-dev`).
31+
2. Install Drupal on this instance: `docker exec drupalvm install-drupal` (you can choose a version using `install-drupal [version]`, using versions like `9.x-dev` or `8.x-dev`).
3232

3333
You should be able to access the Drupal site at `http://localhost`. If you need to share a host directory into the VM, you can do so by adding another `-v` parameter, like `-v /path/on/host:/path/in/container.
3434

@@ -122,7 +122,7 @@ After you've configured your Drupal VM settings in `config.yml` and other config
122122

123123
This will bake a Docker images using Drupal VM's default settings for distro, IP address, hostname, etc. You can override these options (all are listed in the `provisioning/docker/bake.sh` file) by prepending them to the `composer` command:
124124

125-
DRUPALVM_IP_ADDRESS='192.168.89.89' DISTRO='debian9' composer docker-bake
125+
DRUPALVM_IP_ADDRESS='192.168.89.89' DISTRO='debian10' composer docker-bake
126126

127127
This process can take some time (it should take a similar amount of time as it takes to build Drupal VM normally, using Vagrant and VirtualBox), and at the end, you should see a message like:
128128

docs/other/drupal-6.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
If you'd like to use the included configuration and Drush make file to install a Drupal 6 site using an older version of Drush (< 7.x), you may need to make some changes, namely:
22

33
1. Drush < 7.x does not support .yml makefiles; if using Drush 5.x or 6.x, you will need to create the make file in the INI-style format.
4-
2. In your customized `config.yml` file, you will need to use the `default` installation profile instead of `standard` (for the `drupal_install_profile` variable).
4+
2. In your customized `config.yml` file, you will need to use the `default` installation profile instead of `standard` (for the `drupal_install_profile` variable).

0 commit comments

Comments
 (0)