diff --git a/Vagrantfile b/Vagrantfile index befad96798..d1d9f80678 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -15,7 +15,7 @@ Vagrant.configure("2") do |config| ubuntu_mirror = "" vboxadd_version = nil - config.vm.box = "bento/ubuntu-20.04" + config.vm.box = "bento/ubuntu-22.04" config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.synced_folder ".", "/srv/zulip", docker_consistency: "z" diff --git a/docs/development/setup/vagrant-ssh.md b/docs/development/setup/vagrant-ssh.md index 6d878417b7..b2024c8a05 100644 --- a/docs/development/setup/vagrant-ssh.md +++ b/docs/development/setup/vagrant-ssh.md @@ -8,7 +8,7 @@ $ vagrant ssh You should see output that starts like this: ```console -Welcome to Ubuntu 20.04.4 LTS (GNU/Linux 5.4.0-107-generic x86_64) +Welcome to Ubuntu 22.04.3 LTS (GNU/Linux 5.15.0-92-generic x86_64) ``` Congrats, you're now inside the Zulip development environment! diff --git a/docs/development/setup/vagrant-up.md b/docs/development/setup/vagrant-up.md index e326b7dffe..1303404d35 100644 --- a/docs/development/setup/vagrant-up.md +++ b/docs/development/setup/vagrant-up.md @@ -1,7 +1,7 @@ The first time you run this command it will take some time because Vagrant does the following: -- downloads the base Ubuntu 20.04 virtual machine/Docker image +- downloads the base Ubuntu 22.04 virtual machine/Docker image - configures this virtual machine/container for use with Zulip, - creates a shared directory mapping your clone of the Zulip code inside the virtual machine/container at `~/zulip` diff --git a/tools/droplets/README.md b/tools/droplets/README.md index 69c0c098aa..0fff1bb628 100644 --- a/tools/droplets/README.md +++ b/tools/droplets/README.md @@ -130,7 +130,7 @@ so they are notified. - Check "Monitoring", "IPv6", and "User data" - Paste the contents of `tools/droplets/new-droplet-image` into the text box which says `Enter user data here...` - - Name it e.g. `base-ubuntu-20-04.zulipdev.org` + - Name it e.g. `base-ubuntu-22-04.zulipdev.org` 1. Add an A record for `base.zulipdev.org` to point to the new host. 1. Wait for the host to boot. 1. `scp tools/droplets/new-droplet-image base.zulipdev.org:/tmp/new-droplet-image` diff --git a/tools/setup/dev-vagrant-docker/Dockerfile b/tools/setup/dev-vagrant-docker/Dockerfile index b418bd94dc..3733bd785d 100644 --- a/tools/setup/dev-vagrant-docker/Dockerfile +++ b/tools/setup/dev-vagrant-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ARG UBUNTU_MIRROR diff --git a/tools/setup/vagrant-provision b/tools/setup/vagrant-provision index e26e941e5e..a3ecbb1b4b 100755 --- a/tools/setup/vagrant-provision +++ b/tools/setup/vagrant-provision @@ -12,8 +12,8 @@ set -o pipefail # Set the MOTD on the system to have Zulip instructions sudo ln -nsf /srv/zulip/tools/setup/dev-motd /etc/update-motd.d/99-zulip-dev -sudo rm -f /etc/update-motd.d/10-help-text -sudo dpkg --purge landscape-client landscape-common ubuntu-release-upgrader-core update-manager-core update-notifier-common ubuntu-server +sudo rm -f /etc/update-motd.d/10-help-text /etc/update-motd.d/99-bento +sudo dpkg --purge landscape-common sudo dpkg-divert --add --rename /etc/default/motd-news sudo sh -c 'echo ENABLED=0 > /etc/default/motd-news'